Merge "emulator: not start adbd upon ro.kernel.qemu=1" am: 7c271bdc3b
am: 466b098b87

Change-Id: Ic97d252da93210530746f131c2d6fab073cc8fde