Merge "emulator: 64-bit kernel for 32-bit arm image"