Merge "Fix FLAC codec VTS failures" into pi-dev
am: dab059e964

Change-Id: I49768be0a3ebd23f0eb8ebe91b662f4473f4b2cd