[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 skip reason: subject contains skip directive

Change-Id: I36c477f9cc4e4a7ea728a0bb9e698965eb12dfc6