commit c6837c6e067f86c281fc7edd1d0de0a4cc894c38
author Jaesoo Lee <jaesoo@google.com> Fri Apr 28 10:52:15 2017 +0900
committer Jaesoo Lee <jaesoo@google.com> Fri Apr 28 10:52:15 2017 +0900
tree b0e15465810ef65fbab4e9553a7f0d45c1d22dff
parent 5860b2b0b9481623dd2111860f839c7df79159a0
parent 611dfc169d12a3d971662561ca52088d64ab2cd1

resolve merge conflicts of afc0aa78f to oc-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0e1cc5f5367c4840eea5f56670f74a44743f1853

libutils/Android.bp

diff --git a/libutils/Android.bp b/libutils/Android.bp
index 696db3b..83952ab 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -17,8 +17,14 @@
     vendor_available: true,
     host_supported: true,
 
-    header_libs: ["libsystem_headers",],
-    export_header_lib_headers: ["libsystem_headers",],
+    header_libs: [
+        "libsystem_headers",
+        "libcutils_headers"
+    ],
+    export_header_lib_headers: [
+        "libsystem_headers",
+        "libcutils_headers"
+    ],
     export_include_dirs: ["include"],
 
     target: {