Fix up scripts to handle shifts in options for NDK toolchain build.

Need to add thumb support into build-libcxx.sh.