Merge "Change aosp_arm_(a|ab) to 768MB" into oc-mr1-dev