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

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