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

Change-Id: I5eaa4ce20e402218b670a3cedfdc8b896789750b