Merge "adb: print emulator console output" am: 3e3797a947
am: 87363ef509

Change-Id: I330cf8fed5329fb113a67335ed841425cbbf5f19