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

* commit '544f04402a31aa949fa873169f1bf94df69a996f':
  Go back to -O2.