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

Change-Id: I66eeb66e70fdb131e90318df9e2104d60954cbef