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

Change-Id: I6ff20178215895f46b1eb0afec21a8fc55701f00