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 673401774381eabcc1b6c42db43ee4a5cb39c2a8 to aml-frc-release

Change-Id: Ic979874542cb6759d7c6f61e2230b12f880b0212