Merge "ARM emulator: aosp_arm on 64-bit binder and kernel"
am: a0f595ec69

Change-Id: Ic98cd7a1a8615925d3775aefaedf7d0f065af4a5