Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am: 1b21082920 am: c63899dfc8 am: 62985ff9b8 am: 7102435d2c am: a473423c6f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15919336

Change-Id: I820fc2655f9454df7bea5f6e6b5f92cb8daafb03