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

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