Fix standalone Android and NaCl Makefiles to support arm_version=7 and optdebug

Makefile.nacl

Index: Makefile.nacl
diff --git a/Makefile.nacl b/Makefile.nacl
index 2c79ef113e3dbc99a9d2a669529484d42d97c92c..fc3eb28ae0a5439fd12a34d8b6942862805693c1 100644
--- a/Makefile.nacl
+++ b/Makefile.nacl
@@ -77,11 +77,11 @@ GYPENV += host_os=${HOST_OS}
 # ICU doesn't support NaCl.
 GYPENV += v8_enable_i18n_support=0
 
-NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES))
+NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_BUILDS))
 .SECONDEXPANSION:
 # For some reason the $$(basename $$@) expansion didn't work here...
 $(NACL_BUILDS): $(NACL_MAKEFILES)
-	@$(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \
+	@$(MAKE) -C "$(OUTDIR)" -f Makefile.$@ \
 	            CXX=${NACL_CXX} \
 	            LINK=${NACL_LINK} \
 	            BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \
@@ -90,12 +90,12 @@ $(NACL_BUILDS): $(NACL_MAKEFILES)
 
 # NACL GYP file generation targets.
 $(NACL_MAKEFILES):
-	@GYP_GENERATORS=make \
+	GYP_GENERATORS=make \
 	GYP_DEFINES="${GYPENV}" \
 	CC=${NACL_CC} \
 	CXX=${NACL_CXX} \
 	PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
 	build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
 	              -Ibuild/standalone.gypi --depth=. \
-	              -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) \
+	              -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS) \
                       -Dwno_array_bounds=-Wno-array-bounds