am 642c81ea: Merge "Stash original values of CC and CXX."

* commit '642c81ea4559836236a38123feec3d8e51d4b9c2':
  Stash original values of CC and CXX.