Merge "benchmarks: remove more boilerplate." am: f5b44a5ea6
am: 6d4deb3454

Change-Id: I0b2c2ca56086616f45ebc5892e84af6640a7f5c1