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

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