Snap for 8570526 from 39ec5f1a3b09152436701de9f0fab44f9e600112 to mainline-media-swcodec-release

Change-Id: I8e88d96faa60ca510b1160d46a4a7fcec5702534