diff --git a/Android.bp b/Android.bp
index 5987b85..345813a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,7 +46,7 @@
 
     hostdex: true,
 
-    no_standard_libs: true,
+    sdk_version: "none",
     libs: [
         "core-all",
         // TODO(b/129126571): Depend on Conscrypt stubs instead
@@ -77,7 +77,7 @@
     hostdex: true,
     installable: true,
 
-    no_standard_libs: true,
+    sdk_version: "none",
     libs: [
         "core-all",
         // TODO(b/129126571): Depend on Conscrypt stubs instead
@@ -99,7 +99,7 @@
 
     installable: true,
 
-    no_standard_libs: true,
+    sdk_version: "none",
     libs: [
         "core-all",
         // TODO(b/129126571): Depend on Conscrypt stubs instead
@@ -130,7 +130,7 @@
     // Exclude test Android currently has problems with due to @Parameterized (requires JUnit 4.11).
     exclude_srcs: ["okhttp-tests/src/test/java/com/squareup/okhttp/WebPlatformUrlTest.java"],
 
-    no_standard_libs: true,
+    sdk_version: "none",
     libs: [
         "core-all",
         "okhttp-nojarjar",
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000..321bab6
--- /dev/null
+++ b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Builtin Hooks]
+bpfmt = true