Clean up unit munging unit tests using common NaCl API.

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 241 matching lines @@
 $(OBJDIR)/run_unittests: $(UNITTEST_OBJS) $(UNITTEST_LIB_OBJS)
         $(CXX) $(GTEST_LIB_PATH) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) \
                -lgtest -lgtest_main -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
 
 $(UNITTEST_OBJS): $(OBJDIR)/unittest/%.o: unittest/%.cpp \
                 unittest/*.h src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) \
                 -Isrc/ \
                 -I$(LLVM_SRC_PATH)/utils/unittest/googletest/include \
+                -I$(LLVM_SRC_PATH) \
                 -DGTEST_HAS_RTTI=0 -DGTEST_USE_OWN_TR1_TUPLE \
                 $< -o $@
 
 $(OBJS): | $(OBJDIR)
 $(SB_OBJS): | $(SB_OBJDIR)
 
 $(UNITTEST_OBJS): | $(OBJDIR)/unittest
 
 $(OBJDIR):
         @mkdir -p $@
@@ skipping 55 matching lines @@
 bloat: make_symlink
         nm -C -S -l pnacl-sz | \
         bloat/bloat.py --nm-output=/dev/stdin syms > build/pnacl-sz.bloat.json
         @echo See Subzero size breakdown in bloat/pnacl-sz.bloat.html
 
 clean:
         rm -rf pnacl-sz *.o $(OBJDIR) $(SB_OBJDIR) build/pnacl-sz.bloat.json
 
 clean-all: clean
         rm -rf build/