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

Change-Id: If166ea49e3ebbfcc2f23bcee96ede3e39b315e03