Merge "Fix various adb error reporting bugs." am: 8dead17a58 am: e6b808ea5b
am: 38ed0537be

Change-Id: If105ed25a561ef745849b3c76905101a2e2001d5