am 8ec30476: Merge "Fix -O0 builds."

* commit '8ec304764fdc97ee300175ebed16622eddfb6f1f':
  Fix -O0 builds.