diff --git a/src/jdeps_modules.golden b/src/jdeps_modules.golden
index c1d235af36c7c2..0abe2d2eea4cad 100644
--- a/src/jdeps_modules.golden
+++ b/src/jdeps_modules.golden
@@ -8,7 +8,6 @@ java.naming
 java.security.jgss
 java.sql
 java.xml
-jdk.compiler
 jdk.management
 jdk.sctp
 jdk.unsupported
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index d4a86c7d438b0d..34a6a8daa06fe4 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -784,7 +784,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/skyframe:skyframe-objects",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:crosstool_config_java_proto",
-        "//third_party:android_common_25_0_0",
+        "//third_party:android_common_25_0_0_lite",
         "//third_party:auto_value",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -1123,7 +1123,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:android_deploy_info_java_proto",
-        "//third_party:android_common_25_0_0",
+        "//third_party:android_common_25_0_0_lite",
         "//third_party:auto_value",
         "//third_party:guava",
         "//third_party:jsr305",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
index 9dcf277c6e7a2b..eac81c6f435da4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ParsedAndroidResources.java
@@ -13,7 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.android;
 
-import com.android.annotations.VisibleForTesting;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.analysis.actions.ActionConstructionContext;