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

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