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

Change-Id: Iba6f242d33dec9b564d1a37ada1377c458f2f1e4