Merge changes from topic "b152482542-endrun"

* changes:
  Add jni_headers dependencies to hosttests
  Add jni_headers dependency to libshim_jni
  Add jni_headers dependency to libsmartcamera_jni
  Add jni_headers dependency to libperftestscore_jni
  Add jni_headers to libframeworks_coretests_jni

apct-tests/perftests/core/jni/Android.bp

@@ -10,4 +10,5 @@ cc_library_shared {
         "-Wunused",
         "-Wunreachable-code",
     ],
+    header_libs: ["jni_headers"],
 }

core/tests/coretests/apks/install_jni_lib/Android.bp

@@ -24,4 +24,5 @@ cc_test_library {
         "-Wall",
         "-Werror",
     ],
+    header_libs: ["jni_headers"]
 }

core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp

@@ -26,6 +26,7 @@ cc_test_library {
     // All of the source files that we will compile.
     srcs: ["native.cpp"],
 
+    header_libs: ["jni_headers"],
     shared_libs: ["liblog"],
 
     cflags: [

core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp

@@ -25,6 +25,7 @@ cc_test_library {
     // All of the source files that we will compile.
     srcs: ["native.cpp"],
 
+    header_libs: ["jni_headers"],
     shared_libs: ["liblog"],
 
     cflags: [

core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp

@@ -27,6 +27,7 @@ cc_test_library {
     // All of the source files that we will compile.
     srcs: ["native.cpp"],
 
+    header_libs: ["jni_headers"],
     shared_libs: ["liblog"],
 
     cflags: [

packages/CtsShim/build/jni/Android.bp

@@ -17,5 +17,6 @@
 cc_library_shared {
     name: "libshim_jni",
     srcs: ["Shim.c"],
+    header_libs: ["jni_headers"],
     sdk_version: "24",
 }

tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp

@@ -33,5 +33,6 @@ cc_test_library {
         "-Werror",
         "-Wno-unused-parameter",
     ],
+    header_libs: ["jni_headers"],
     stl: "c++_static",
 }