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

Change-Id: Ibb7cff3369a3ae351a3d47ed3410b8e256b96b52