Improve some adb error logging

Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848