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

Change-Id: I6d17a69d49ad71c6bb7c9a6453b44cbb30781a68