Merge "Minor "adb help" fixes."