Merge "[automerger skipped] Merge "AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into oc-mr1-dev am: dc8528f6c6 am: 4d5d3df900 -s ours am: 8e552f171d -s ours am: 9b84e7e55f -s ours am skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 82cb46d0d5 is in history" into qt-r1-dev-plus-aosp