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

Makefile.nacl

 #
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 59 matching lines @@
 ifeq ($(wildcard $(NACL_TOOLCHAIN)),)
   $(error Cannot find Native Client toolchain in "${NACL_TOOLCHAIN}")
 endif
 
 # For mksnapshot host generation.
 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 $@)) | \
                                 python -c "print raw_input().capitalize()") \
                     builddir="$(shell pwd)/$(OUTDIR)/$@"
 
 # 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