Merge "C2SoftMp3Dec: fix OOB write in output buffer" into qt-dev am: 1b210829 am: c63899df am: 62985ff9 am: 7102435d am: a473423c am: 089582db am: be645fbb am: c9cb2f53

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

Change-Id: Iccb760a5d63fd933b0e8b3916eb4221a29d1dc47