Merge "adbd: optionally use qemud pipe without ro.kernel.qemu" am: b3c363f32c
am: a9381c26ab

Change-Id: Iaf3be508465ea6ab59fc6a7f4fb0b2878d50b279