am 35911d66: am e45ff20f: Merge "Constant fold after inlining."

* commit '35911d660fcbb1907d16eb408ffe92da5f5b0679':
  Constant fold after inlining.