Merge 78fb319ce95cae815bd5e501f19fea947a8e41ac on remote branch

Change-Id: Ie78f3d42313f4bbe117cd774423ad968cabf84dc
diff --git a/Android.bp b/Android.bp
index f1b0573..9d2fb68 100644
--- a/Android.bp
+++ b/Android.bp
@@ -117,6 +117,11 @@
 
 java_library_static {
     name: "guice",
+    visibility: [
+       "//external/testng:__pkg__",
+       "//platform_testing/libraries/audio-test-harness/server:__pkg__",
+       "//tools/tradefederation/core:__pkg__",
+    ],
     host_supported: true,
     hostdex: true,
     sdk_version: "core_current",
diff --git a/extensions/persist/lib/log4j-1.2.14.jar b/extensions/persist/lib/log4j-1.2.14.jar
deleted file mode 100644
index 6251307..0000000
--- a/extensions/persist/lib/log4j-1.2.14.jar
+++ /dev/null
Binary files differ