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

Change-Id: I4587f92de271d11137fad4e6e843abc17267cbcf