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

Change-Id: I06e55c29deca1b3af5b60b3a746686a5432bb5a1