Merge "Fix to resolve CTS test case testDecodeUsacDrcEffectTypeM4a" into pi-dev
am: cf568f6991

Change-Id: Iae503d219f6cddcd19e5a6c46baae6fed1e6a357