am d6c4fcab: am 732bdb28: Merge "Load compiler environment for a second arch."

* commit 'd6c4fcabf6b132927f6980569427f9475a403ed3':
  Load compiler environment for a second arch.