Merge "Upgrade emulator kernels" am: b85e5ba482 am: 247b3cfc3b
am: bd4ae6888d

Change-Id: I5d8c19d8e0439c39a6eaa04c4d808ed8b38b70cb