[automerger skipped] Merge "emulator: 64-bit kernel for 32-bit arm image" am: 7fd8d258e0
am: b9e5e5f083  -s ours

Change-Id: Ibe718d29e45540463970e1bde7006f5a53cde89b