Merge "BENCHMARK_MAIN now needs a trailing semicolon."
am: 47d97d3991

Change-Id: I598f7ff4357aee13138fcaaa4f3d3399b623ba5f