Snap for 10453563 from b587b3078b27c4a323060db7e8a6d8569b7e3c65 to mainline-media-swcodec-release

Change-Id: Iedbf5fe53fd60e47dca92ddfdbbdbfadd866aa8d