DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I706d73851940c17bc3b804bd0824aede674e950a
diff --git a/sensorservice/libsensorndkbridge/Android.bp b/sensorservice/libsensorndkbridge/Android.bp
index f79d708..cb4210c 100644
--- a/sensorservice/libsensorndkbridge/Android.bp
+++ b/sensorservice/libsensorndkbridge/Android.bp
@@ -32,4 +32,12 @@
     static_libs: [
         "android.hardware.sensors@1.0-convert",
     ],
+
+    header_libs: [
+        "libandroid_sensor_headers",
+    ],
+
+    export_header_lib_headers: [
+        "libandroid_sensor_headers",
+    ],
 }