[automerger skipped] [automerger] [DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx am: 04e48ed870 am: 8b8f583fa5 am: 30d710f5af am: 3faebc5eb3 skipped: b257d6414e am: ccab80f001 am: c49dabdd95 -s ours am: 83ded3350e -s ours am: b1ff5c4a80 -s ours am: f009a27850 -s ours
am: f3322745eb -s ours
am skip reason: change_id I33f476d94baec2feffc7bcccd0ad0481b8452518 with SHA1 9a44849c88 is in history

Change-Id: I0b4651dc2bc4c1e069ccc597ba39404c9cf1576d