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

Change-Id: Icd40360d0b86b2552b87840d8a002c66caa8ba82