Merge "Revert "adb: add transport benchmark.""