am 2a0bf42a: am 522b3089: Merge "Allow changing the optimization level of a build with env variable."

* commit '2a0bf42abadb9bf6fa25249e7824f7a7e74c3523':
  Allow changing the optimization level of a build with env variable.