am 85f5c420: am e8d64956: Merge change I6b913ab8 into eclair

Merge commit '85f5c42069ab6ae90d1ed1c04f22a7b42407e55d' into eclair-mr2-plus-aosp

* commit '85f5c42069ab6ae90d1ed1c04f22a7b42407e55d':
  Fix toolchain scripts for Darwin and Cygwin.