Merge "build/make/configure.sh: Fix armv7 builds in Xcode7."