frc_340819030 (10622519,com.google.android.go.media,com.google.android.go.media.swcodec,com.google.android.media,com.google.android.media.swcodec)
Snap for 9816131 from 6cb2c0123613c1a0273164f3bf69651ec8ba7b05 to aml-frc-release

Change-Id: Ief93542334e6f56530c75183af4a57c681a6dc76