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

Change-Id: Ib38f51bb371e1cbc9d7277b890bff35924092b37