Merge "bionic: move benchmarks out of tests directory"