Snap for 8712255 from 49ade6f6adac17c4b917e4bf5cea109028fe4f50 to mainline-media-swcodec-release

Change-Id: I37d130d424ca76d192d8386da4f1ac207510dfd7