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

Change-Id: Id3956de89c93ecbc6b6fbb28a64d2e7a0aa2646d