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

Change-Id: I18ef47536a73caa3fa857d6b6e3fe36323b90f30