[automerger skipped] DO NOT MERGE C2SoftMp3Dec: fix OOB write in output buffer am: c3e2eb5966 -s ours am: 32cbbe70ec -s ours am: 3f5391826e -s ours am: a76bdd745e -s ours am: 965f099ecf -s ours am: 242ff48709 -s ours am: d145276a80 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/av/+/15918944 Change-Id: I7c6424f8948f801eb23878b62e5f4a8ddef36646