Merge "Update emulator 4.4 kernel for x86_64" am: dadce44712
am: a65943be1b

Change-Id: If0c4337969319fd86c9341e6c62bf42fb93c58b4