Merge "BENCHMARK_MAIN now requires a semicolon." am: 981379b70f am: 64c59c23f3
am: 1aee775518

Change-Id: I34a85e2786407dc3d9bdd0e64dc6dc0a627974b5