Snap for 8581835 from c5d7818747105486d5e7b6a8647a69d6d87e450d to mainline-media-swcodec-release

Change-Id: I2e70d147fdf607e8b5e731627547860d2d9e95e9