Snap for 8817865 from 9aff0d1d267c849b28ffe0ef7797a62c8132e887 to mainline-go-media-swcodec-release

Change-Id: I283bf342c714bb400f784c066b512b3a1ef20a4f