Merge "adb: rationalize fatal/error logging."
am: f2b170573f

Change-Id: I63c4a537284ba446d57a28884fbda60f281ca3b0