Merge "Fix FLAC codec VTS failures" into pi-dev