Snap for 8570526 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-media-swcodec-release

Change-Id: I464a1b89b72cdf4e2c84273129697a20c129e504