Snap for 8570526 from d4bfaa8ce0356656942203fbdc58919a92882127 to mainline-media-swcodec-release

Change-Id: I0a1de9babc111e9aa28343c970b52e5d36fc7121