Merge changes from topic 'system-vendor-internal-pick' am: 3dfaa44491
am: 004f8f9633

Change-Id: Ie692b035ea102dbeccb0e8472cd103a804920455
diff --git a/base/Android.bp b/base/Android.bp
index c1c0bf8..afb7dd3 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -59,7 +59,6 @@
 
     cppflags: libbase_cppflags,
     shared_libs: ["liblog"],
-    header_libs: ["libutils_headers"],
     target: {
         android: {
             srcs: [