Merge "[DO NOT MERGE] AMR WB encoder: prevent OOB write in ACELP_4t64_fx" into nyc-dev