am 688ccb34: am 1f22df41: am b4e31b93: Merge change I3f0d5eb5 into eclair

Merge commit '688ccb34589b3a810dbdc7e79eab206a3d9227a6'

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