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

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