Merge "Merge "Fix yet more overflows in amrwbenc" into nyc-dev am: b4f67b37e9 am: 5a3b7974a4" into nyc-mr1-dev-plus-aosp
am: c895c3ab41

* commit 'c895c3ab413d86d053549f1473f3d10b7a2210f0':

Change-Id: I02ed7e3dd7d92000ad70889707d343d1c509dd03