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

Change-Id: I8a0caadf8475f34700efb867cf9cdca4e94f27da