Merge changes from topic "b152482542-endrun" am: c3508715f3

Change-Id: I39971e306d520bed65045df79f4ff1f8959538b3

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: [