Merge "emulator: enable 32bit x86 to run on 64bit kernel"
am: 7e41fb46db

Change-Id: I456058d514ae5f3ab3765735e2b6565f9bb34ccd