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

Merge commit '1f22df41d80b06331056fe3915a3d7c394b1485f' into eclair-mr2-plus-aosp

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