Merge "bionic benchmarks: limit benchmark run time to 1s real time"