Merge "Set cflags for the right arch in the arm64 makefile"