Merge "Enable CFI for the amrwbenc test." into oc-dev-plus-aosp
am: d371758dc0

Change-Id: Ib94c49152bd7cc87b2976e351d1647a1690e0619