Merge "Move "adb shell" over to getopt(3), and allow -tt on old devices."