Merge "Revert "adb: make benchmarks build on the host.""