am 87af04a4: Merge "Improve some adb error logging"

* commit '87af04a42ec2d959cced0f1c01888f9cf3b2b9c5':
  Improve some adb error logging