am b4e31b93: Merge change I3f0d5eb5 into eclair

Merge commit 'b4e31b931d08e6269a194a1c24e23281410dff64' into eclair-mr2

* commit 'b4e31b931d08e6269a194a1c24e23281410dff64':
  Update the build-toolchain.sh script.