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

Change-Id: Id8566ce6ec5f540730b2d2c3445b48cc61886197