Merge "Revert "Remove non-NDK headers from the NDK."" am: 3bd6a65cf7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1987151

Change-Id: I09278fbff1e63e0bd290f326e097e7e1f3a31a2b
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp
index c953190..79c8c8f 100644
--- a/libs/binder/ndk/Android.bp
+++ b/libs/binder/ndk/Android.bp
@@ -165,6 +165,17 @@
     license: "NOTICE",
 }
 
+// TODO(b/160624671): package with the aidl compiler
+ndk_headers {
+    name: "libbinder_ndk_helper_headers",
+    from: "include_cpp/android",
+    to: "android",
+    srcs: [
+        "include_cpp/android/*.h",
+    ],
+    license: "NOTICE",
+}
+
 ndk_library {
     name: "libbinder_ndk",
     symbol_file: "libbinder_ndk.map.txt",