[automerger skipped] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: f30859cd4b -s ours am: 7242dcd767 -s ours am: 3186eb6498 -s ours am: cd459bae64 -s ours
am: 814d18929c -s ours
am skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history

Change-Id: Idc35548585e957e18657edff8e778f3c0d26c81d