Merge "Revert "adb: add transport benchmark."" am: 3876e37319
am: 566cf781cf

Change-Id: I30b46eb5392468bc3542d0ee6d36240c361178ad