Snap for 8570526 from be59e71aea50702c7f0fbdb5d015eb14129c53fc to mainline-media-swcodec-release

Change-Id: I5a944fbb2c70870b144b5245369aa8afa2d69d6a