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

Change-Id: I9bf2416bf2c540c55362d348bbef7fb44757ffb1