Use jni_headers instead of JNI_H_INCLUDE

Bug: 152482542
Test: m libctscamera2_jni
Exempt-From-Owner-Approval: build refactor
Change-Id: I5a1a7e32de907702b17a25a6fe59861824479f98
diff --git a/tests/camera/libctscamera2jni/Android.mk b/tests/camera/libctscamera2jni/Android.mk
index 798674b..702d9f5 100644
--- a/tests/camera/libctscamera2jni/Android.mk
+++ b/tests/camera/libctscamera2jni/Android.mk
@@ -26,7 +26,6 @@
 	dynamic-depth-validate-jni.cpp
 
 LOCAL_C_INCLUDES := \
-	$(JNI_H_INCLUDE) \
 	system/core/include \
 
 # Flags needed by DNG SDK
@@ -38,6 +37,7 @@
 # Flags related to dynamic depth
 LOCAL_CFLAGS += -Wno-ignored-qualifiers -DSTATIC_LIBXML=1
 
+LOCAL_HEADER_LIBRARIES := jni_headers
 LOCAL_STATIC_LIBRARIES := libdng_sdk_validate libjpeg_static_ndk
 # Dynamic depth libraries
 LOCAL_STATIC_LIBRARIES += libdynamic_depth_ndk libimage_io_ndk libbase_ndk libxml2_ndk