Snap for 9680066 from 9d313f901fc3a2bb63dc9bdf0fb401120a79a51a to mainline-media-swcodec-release

Change-Id: I3a3a024a94e1af05025180eeb0473870d8f6ede0