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

Change-Id: I6db46408beb60356cedc6c8d757201d195e7d4bd