aml_swc_331116000 (9323960,com.google.android.media.swcodec)
Snap for 8570526 from 810e6addccfd8913c3e82022699a7e61866f20b6 to mainline-media-swcodec-release

Change-Id: I2a79c50cd1de34054798014dcb341e4770f402e1