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

Change-Id: I7277a43dfebc01d8e9ef7a9c39cd8dd7b9633c9b