Merge change If7aa22af into eclair

* changes:
  Remove bash-ism from build-ndk-sysroot.sh