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

Change-Id: Iad5ec02575663fe83ba0666aeebfb8c33567c14b