Merge "emulator: enable 32bit x86 image to run on 64bit kernel"
am: 19fe49eb5d

Change-Id: I0876b6942e94e582ca798603059f48cbe7ddf15d