Merge "adb: improve help for -t/-tt." am: 7f5116e581 am: 98e1c94816

Change-Id: I9ff2cc1acc5fbe74de3f9c2ae6f1e8321b2520aa