Merge "emulator: uses 4.4 kernel for x86 and x86_64" am: 0cc5071581
am: 9c92234ec1

Change-Id: Ic6af4aaa796c6f9f689a2484d1822211bd756f98