Merge "build/make/iosbuild.sh: Be more explicit about armv7."