Merge change 2085 into donut

* changes:
  This fixes the build to always define the ANDROID macro, and remove an empty -I from the compiler options.

ndk/build/core/build-binary.mk

@@ -29,6 +29,10 @@ include $(BUILD_SYSTEM)/build-module.mk
 # list of generated object files
 LOCAL_OBJECTS :=
 
+# always define ANDROID when building binaries
+#
+LOCAL_CFLAGS := -DANDROID $(LOCAL_CFLAGS)
+
 #
 # Add the default system shared libraries to the build
 #

ndk/build/core/definitions.mk

@@ -370,7 +370,6 @@ $$(_OBJ): PRIVATE_CC       := $$($$(my)CC)
 $$(_OBJ): PRIVATE_CFLAGS   := $$($$(my)CFLAGS) \
                               $$($$(my)_$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \
                               -I$$(LOCAL_PATH) \
-                              -I$$(OBJS_DIR)   \
                               $$(LOCAL_CFLAGS) \
                               $$(NDK_APP_CPPFLAGS) \
                               $$(NDK_APP_CFLAGS) \
@@ -430,7 +429,6 @@ $$(_OBJ): PRIVATE_CXX      := $$($$(my)CXX)
 $$(_OBJ): PRIVATE_CXXFLAGS := $$($$(my)CXXFLAGS) \
                               $$($$(my)_$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \
                               -I$$(LOCAL_PATH) \
-                              -I$$(OBJS_DIR)   \
                               $$(LOCAL_CFLAGS) \
                               $$(NDK_APP_CPPFLAGS) \
                               $$(NDK_APP_CXXFLAGS) \