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

Change-Id: If2fcea271f588d906285d5448c1b3793a39e6e4a