Merge "Improve adb help text and adb backup error reporting." am: 82a2b2441c
am: da2319bf4d

* commit 'da2319bf4d8593de1ade95557d77e4680552bb84':
  Improve adb help text and adb backup error reporting.