Merge "emulator: uses 4.4 kernel for x86 and x86_64"