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

Change-Id: Ib907b8c7a1d74ac87c019cb51ce58b10c19d359f