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