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

Change-Id: I44b7c270b29dfbd1deb258403ca98486d925ab2f