Snap for 7521021 from 5a2ead4f79e3b4c604edd450714bd1d925de1d4e to mainline-media-swcodec-release

Change-Id: I1b46c8585c069f7f21dd46016f24ca3f929bdc9d