Snap for 8570526 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-media-swcodec-release Change-Id: Ib27c9b95cd8975220ee7a4709039786f350c9c3b