Merge "iosbuild.sh: Move to build/make and tidy up a bit."