am 6f9d7444: Merge "Fix running the bionic benchmarks on the host."

* commit '6f9d7444e801487fb2362955c62c379a681a55f6':
  Fix running the bionic benchmarks on the host.