Merge "Improve adb help text and adb backup error reporting."