Snap for 8817865 from 201ea0d1487c75a4723586dc9fc0492f8416f835 to mainline-go-media-swcodec-release

Change-Id: I660d716b1d5c7df4915e54fc32e9472984b04c18