Merge "Fix running the bionic benchmarks on the host."