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

Change-Id: I9e782c46d9ddf43b61c8feb5e2c33f2a295e8358
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: [