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

Change-Id: I1723c515031386b0ce28688208477352184718ea