Merge "Improve "adb help" output."