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

Change-Id: If2d111bd833c5e507ba4a4fbde4e7e21b895e004