Merge "BENCHMARK_MAIN now requires a semicolon."
am: 981379b70f

Change-Id: Id61096655f23b5c4679a2b0edfca58a1329ff6ad