diff --git a/core/proguard_basic_keeps.flags b/core/proguard_basic_keeps.flags
index ea200c1..7e7b270 100644
--- a/core/proguard_basic_keeps.flags
+++ b/core/proguard_basic_keeps.flags
@@ -83,14 +83,13 @@
 # 1) runtime-visible annotations will still be kept, and 2) compile-time
 # annotations are stripped by R8 anyway.
 # Note: The ** prefix is used to accommodate jarjar repackaging.
-# TODO(b/266561579): Remove this exemptions after resolving jarjar-ed transitive libs
+# TODO(b/242088131): Remove these exemptions after resolving transitive libs
+# dependencies that are provided to R8.
 -dontwarn **android**.annotation*.**
-
-# These classes generate warnings of the kind `Library class extends program class`
-# because some apps have deps that statically include the same libraries as the app,
-# and r8 complains that a library is implementing a class provided by the app (the "program").
--dontwarn com.google.protobuf.**
--dontwarn kotlin.reflect.jvm.internal.ReflectionFactoryImpl
+-dontwarn **com.google.errorprone.annotations.**
+-dontwarn javax.annotation.**
+-dontwarn org.checkerframework.**
+-dontwarn org.jetbrains.annotations.**
 
 # Less spammy.
 -dontnote
diff --git a/envsetup.sh b/envsetup.sh
index 32e1a32..0272624 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1881,11 +1881,6 @@
         color_reset=""
     fi
 
-    if [[ "x${USE_RBE}" == "x" && $mins -gt 15 && "${ANDROID_BUILD_ENVIRONMENT_CONFIG}" == "googler" ]]; then
-        echo
-        echo "${color_warning}Start using RBE (http://go/build-fast) to get faster builds!${color_reset}"
-    fi
-
     echo
     if [ $ret -eq 0 ] ; then
         echo -n "${color_success}#### build completed successfully "
diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 194ff58..40f7c92 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -66,7 +66,7 @@
     self.fsckerofs_path = os.path.join(
         OPTIONS.search_path, "bin", "fsck.erofs")
     self.blkid_path = os.path.join(
-        OPTIONS.search_path, "bin", "blkid")
+        OPTIONS.search_path, "bin", "blkid_static")
     self.avbtool = avbtool if avbtool else "avbtool"
     self.sign_tool = sign_tool