Finished small fixups.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
 #        PNACL_BIN_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 264 matching lines @@
                -Wno-unknown-pragmas -I$(NACL_ROOT) -I$(NACL_ROOT)/..
 
 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib -Wl,--gc-sections \
   $(LD_EXTRA) $(STDLIB_FLAGS)
 # Not specifying -Wl,--gc-sections but instead doing bitcode linking GC w/ LTO.
 SB_LDFLAGS := $(LINKOPTLEVEL) $(LD_EXTRA)
 
 # List the target-specific source files first, which generally take longer to
 # compile, in the hope of improving parallel build time.
 SRCS = \
-  IceASanInstrumentation.cpp \
   IceAssemblerARM32.cpp \
-  IceInstrumentation.cpp \
   IceInstARM32.cpp \
   IceInstMIPS32.cpp \
   IceInstX8632.cpp \
   IceInstX8664.cpp \
   IceTargetLowering.cpp \
   IceTargetLoweringARM32.cpp \
   IceTargetLoweringMIPS32.cpp \
   IceTargetLoweringX86.cpp \
   IceTargetLoweringX8632.cpp \
   IceTargetLoweringX8664.cpp \
@@ skipping 23 matching lines @@
   IceThreading.cpp \
   IceTimerTree.cpp \
   IceTranslator.cpp \
   IceTypes.cpp \
   LinuxMallocProfiling.cpp \
   main.cpp \
   PNaClTranslator.cpp
 
 ifndef MINIMAL
   SRCS += \
+    IceASanInstrumentation.cpp \
     IceConverter.cpp \
+    IceInstrumentation.cpp \
     IceTypeConverter.cpp
 endif
 
 ifdef WASM
   SRCS += \
     WasmTranslator.cpp
 endif
 
 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
 SB_OBJS=$(patsubst %.cpp, $(SB_OBJDIR)/%.o, $(SRCS))
@@ skipping 438 matching lines @@
 
 help-check-xtest:
         @cat Makefile.standalone-help/check-xtest.txt
 
 clean:
         rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \
           $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json
 
 clean-all: clean
         rm -rf build/ crosstest/Output/