Merge "libnativehelper is implicitly available." into jb-dev

Author: enh-google

native/android/Android.mk

@@ -30,8 +30,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_C_INCLUDES += \
     frameworks/base/native/include \
-    frameworks/base/core/jni/android \
-    dalvik/libnativehelper/include/nativehelper
+    frameworks/base/core/jni/android
 
 LOCAL_MODULE:= libandroid
 

native/graphics/jni/Android.mk

@@ -25,8 +25,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_C_INCLUDES += \
 	external/skia/include/core \
 	frameworks/base/native/include \
-	frameworks/base/core/jni/android/graphics \
-	dalvik/libnativehelper/include/nativehelper
+	frameworks/base/core/jni/android/graphics
 
 LOCAL_MODULE:= libjnigraphics