Change arch flags back to armv7, armv7s until arm64 stuff can be worked out.