am 515d828f: Merge "Go back to -O2."

* commit '515d828fd51f55bc71a6bcd268a7311f614d28b0':
  Go back to -O2.