diff --git a/Android.bp b/Android.bp
index 6c10306..8b20933 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,17 +49,17 @@
 java_import {
     name: "error_prone_annotations",
     host_supported: true,
-    jars: ["error_prone/error_prone_annotations-2.7.1.jar"],
+    jars: ["error_prone/error_prone_annotations-2.8.1.jar"],
 }
 
 java_import {
     name: "error_prone_core",
     host_supported: true,
     jars: [
-        "checkerframework/dataflow-shaded-3.11.0.jar",
-        "checkerframework/javacutil-3.11.0.jar",
-        "error_prone/error_prone_core-2.7.1-with-dependencies.jar",
-        "error_prone/error_prone_annotations-2.7.1.jar",
+        "checkerframework/dataflow-errorprone-3.15.0.jar",
+        "checkerframework/javacutil-3.15.0.jar",
+        "error_prone/error_prone_core-2.8.1-with-dependencies.jar",
+        "error_prone/error_prone_annotations-2.8.1.jar",
         "javac/javac-9+181-r4173-1.jar",
         "jFormatString/jFormatString-3.0.0.jar",
     ],
@@ -69,7 +69,7 @@
     name:  "error_prone_test_helpers",
     host_supported: true,
     jars: [
-        "error_prone/error_prone_test_helpers-2.7.1.jar",
+        "error_prone/error_prone_test_helpers-2.8.1.jar",
         "jimfs/jimfs-1.1.jar",
     ],
 }
diff --git a/checkerframework/METADATA b/checkerframework/METADATA
index bd4565d..bb2a793 100644
--- a/checkerframework/METADATA
+++ b/checkerframework/METADATA
@@ -11,12 +11,12 @@
   }
   url {
     type: ARCHIVE
-    value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-shaded/3.11.0/dataflow-shaded-3.11.0.jar"
+    value: "https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/3.15.0/dataflow-errorprone-3.15.0-sources.jar"
   }
   url {
     type: ARCHIVE
-    value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.11.0/javacutil-3.11.0.jar"
+    value: "https://repo1.maven.org/maven2/org/checkerframework/javacutil/3.15.0/javacutil-3.15.0-sources.jar"
   }
-  version: "3.11.0"
-  last_upgrade_date { year: 2021 month: 6 day: 16}
+  version: "3.15.0"
+  last_upgrade_date { year: 2021 month: 8 day: 18}
 }
diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar b/checkerframework/dataflow-errorprone-3.15.0-sources.jar
new file mode 100644
index 0000000..0550a67
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar
Binary files differ
diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar.asc b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.asc
new file mode 100644
index 0000000..6b011f7
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgzR/bAAoJELFmmKSt9NY4gcsH/3P/tCkzmoShP7gQiksDrvQd
+dKKOt5WBZEcAeeGy21vIqSgZjM18XPOpZh7lpbzfbCESx417eU8TpbJKqi+4M6lq
+7CNwLgebweErD8ow2EUflC8o7VtudIZK9Xs0y3A+qiJJfMfxoJFE7dx2tNEaGROO
+yAibfhX2Hn+QfjyzuAFJDO3Dl2E1a8PN7AkV5+pPNnIvmlv/15s8c97vaESHaqYD
+PyCMeOO/J5B4eRSix8870Df4pDbYpLFj61Am0uDRLIxwN5S8mjqhHRW7ScVL7mx/
+hhbDz0HCnAUtCG22bcJVErC7iimB/ViGMMRwyUfvkbg3N//ZQtmVfYo8fLEOG9Y=
+=VFpP
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.15.0-sources.jar.sha1 b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.sha1
new file mode 100644
index 0000000..e4dbe72
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0-sources.jar.sha1
@@ -0,0 +1 @@
+7ecc58b5dfd0332b96e3146f02bc3bb54d098767
\ No newline at end of file
diff --git a/checkerframework/dataflow-errorprone-3.15.0.jar b/checkerframework/dataflow-errorprone-3.15.0.jar
new file mode 100644
index 0000000..44d8e6b
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0.jar
Binary files differ
diff --git a/checkerframework/dataflow-errorprone-3.15.0.jar.asc b/checkerframework/dataflow-errorprone-3.15.0.jar.asc
new file mode 100644
index 0000000..963e301
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgzR/bAAoJELFmmKSt9NY4tbgH/2ElRkNYUbVKkn7ZvvppCB9+
+MPpqQCSP19dYVWEvAXD75s7NKIBjlhLsId6nisUysncZer/H8UzHFOonV8AEfXKP
+C1GGwbXgk9ISAdwQ5n+MDqE0AGh19snPAf09Qz9YtgnsLJHZHZNz/a/BuVwkcC3y
+zpVSKjenIigmmVDIbxjqMejqPpUu/Xukxu1vz6Yq1fg4VMtQk3lggUGxsEQUS+bf
+VgV8Cl/C8q2xLklZ1x8iNWzd5HgXTOGNAhJ0wXoy5cUkUgsP1VazCLd418xiR4+q
+IYjjGgDfVjduDRkRXuComJDdDQvKnaOl6PfdlsyFbEmlW5cCkRneoHcV8tMUT3s=
+=BP9M
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-errorprone-3.15.0.jar.sha1 b/checkerframework/dataflow-errorprone-3.15.0.jar.sha1
new file mode 100644
index 0000000..75cca97
--- /dev/null
+++ b/checkerframework/dataflow-errorprone-3.15.0.jar.sha1
@@ -0,0 +1 @@
+7004cda299790fb01db2cc452242d7657a232ae5
\ No newline at end of file
diff --git a/checkerframework/dataflow-shaded-3.11.0-sources.jar b/checkerframework/dataflow-shaded-3.11.0-sources.jar
deleted file mode 100644
index f154e59..0000000
--- a/checkerframework/dataflow-shaded-3.11.0-sources.jar
+++ /dev/null
Binary files differ
diff --git a/checkerframework/dataflow-shaded-3.11.0-sources.jar.asc b/checkerframework/dataflow-shaded-3.11.0-sources.jar.asc
deleted file mode 100644
index 419a5c7..0000000
--- a/checkerframework/dataflow-shaded-3.11.0-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.64
-
-iQEcBAABAgAGBQJgPVllAAoJELFmmKSt9NY4mGUH/il7UpoQzGkk1iElP2W2XohA
-IK7+4h+/OToWq7sCskDuhUPqkJsFgy/IdBawJ8B+dZItuNgXc6Viych1+zcxLddQ
-mFEMf70mJXatQEnjHwpCemUboDpcBqbBU1xS35zkvXlGr37LUyK6x9+RPIVGXV1h
-QoNmuIuiiSPeH2IDWHkt01PQCh6hp+MXG0458NmjvUCSGUWdR0O9j0rLEE8G4Ust
-r6jWrjM0fzE6KV3w/ZfoY505b9/+Re9rgaBZWpmdIuwanlE0LpZtkrtfpAdHcbHt
-qsKesF6vLM5dYL9lhuzC2n3yMoOn4rGieR6aP1MJ2U9UWy/As2blPo2x2zpSPtI=
-=tyll
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-shaded-3.11.0-sources.jar.sha1 b/checkerframework/dataflow-shaded-3.11.0-sources.jar.sha1
deleted file mode 100644
index 1e79493..0000000
--- a/checkerframework/dataflow-shaded-3.11.0-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ef848fbb9be5eb821dcf53fce27abf1f9dbd7ba3
\ No newline at end of file
diff --git a/checkerframework/dataflow-shaded-3.11.0.jar b/checkerframework/dataflow-shaded-3.11.0.jar
deleted file mode 100644
index cf4bfeb..0000000
--- a/checkerframework/dataflow-shaded-3.11.0.jar
+++ /dev/null
Binary files differ
diff --git a/checkerframework/dataflow-shaded-3.11.0.jar.asc b/checkerframework/dataflow-shaded-3.11.0.jar.asc
deleted file mode 100644
index 38bc2d2..0000000
--- a/checkerframework/dataflow-shaded-3.11.0.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.64
-
-iQEcBAABAgAGBQJgPVllAAoJELFmmKSt9NY4I6kIAKY7QzwTAkB4mImtTI58JfVR
-MT4a+PIVMKDgyXCA7ouUeDIJPX+MJojIOboJGm1i6vhjZxX1VT10olcrDBgHNXYc
-D6Nu30R0/gWW7cqdJCXwkKFe2VaNHi31Zx6iE59EbRdhpP0tyQsY6XQsAowFafDH
-bI+ceYKTxpPnldflMBMm1ZOBBvViDt+1kWDuOsgSTiy5FsGx90M/FGbMoWwCSpPb
-gK8ixpnVV91GdoTs48yG1y4n/tlfm+WLO/lKduDsaYm5Z7rCQsFNqgUqX+o1q1Mm
-Y9Rzt7EpDnMrYc2P2rFJ0/h3wG5U7CE3Ai+dxiXaaQZL+X5coL/mtkUZRrkYj7A=
-=mDN+
------END PGP SIGNATURE-----
diff --git a/checkerframework/dataflow-shaded-3.11.0.jar.sha1 b/checkerframework/dataflow-shaded-3.11.0.jar.sha1
deleted file mode 100644
index b17be32..0000000
--- a/checkerframework/dataflow-shaded-3.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a1ad6b6e1519fd5b5d684a3c1be1e7a7d87c058d
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.11.0-sources.jar b/checkerframework/javacutil-3.11.0-sources.jar
deleted file mode 100644
index ba15c76..0000000
--- a/checkerframework/javacutil-3.11.0-sources.jar
+++ /dev/null
Binary files differ
diff --git a/checkerframework/javacutil-3.11.0-sources.jar.asc b/checkerframework/javacutil-3.11.0-sources.jar.asc
deleted file mode 100644
index a9c66ca..0000000
--- a/checkerframework/javacutil-3.11.0-sources.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.64
-
-iQEcBAABAgAGBQJgPVl4AAoJELFmmKSt9NY4QHMIAJUayrd5o4S9naCRYldVJ/BE
-xBXcDCtrxDV7IgaRiB4B6R/lheV/Fq4kbHBdVF/weRxMUlN6fPEZ7ATZHmYqMAP2
-YwPh+nTXEVUIvA1Pr+kYPkD1yBJN+xoXRP71tW0QGUmPClEmERWUoSH91F4Ik8x4
-OLCzCYobJb1xxXOmeUN5MTIWYQLQbQsDVggfQXKp31/mRb+DRcXvp6MtTXnlRqq7
-EL4I8s8rTprLOR8ZN3IRm5nbR9Q2SVYFi8O+ZX7+5Xg3kxZRqPRYbAKZFyukfYQ3
-SxKh2K/2WCSc3MyM8PKGEMcqLn1mTbQvtzX0eD579PmBCfGNmUB7gYURvet81fw=
-=qNuO
------END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.11.0-sources.jar.sha1 b/checkerframework/javacutil-3.11.0-sources.jar.sha1
deleted file mode 100644
index 45addd6..0000000
--- a/checkerframework/javacutil-3.11.0-sources.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ef29934e8139cf475d82c92d8bed81687767b017
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.11.0.jar b/checkerframework/javacutil-3.11.0.jar
deleted file mode 100644
index 8a81e46..0000000
--- a/checkerframework/javacutil-3.11.0.jar
+++ /dev/null
Binary files differ
diff --git a/checkerframework/javacutil-3.11.0.jar.asc b/checkerframework/javacutil-3.11.0.jar.asc
deleted file mode 100644
index d19457d..0000000
--- a/checkerframework/javacutil-3.11.0.jar.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: BCPG v1.64
-
-iQEcBAABAgAGBQJgPVl4AAoJELFmmKSt9NY4TewIAI31EmMFsFLgwuleGUmOnBj4
-D7akfYemD0+Zvd9xktw7ZgFBm0j7UPBVM+T4gCwQ1fbD+vQoER9/K9+SEubub916
-iNCl1gzX5bdLC6I4ZEAvSCl1qkzi8z/O/pjfaLfR+CzDIf5sqgj2BLj/CYkFzKaM
-PvUw9hcEBcRfCfk2MYUbbJdWVXx4PIPWVlgtR6Fy+gNIttBnfHXlymN5W6wwCgQo
-dYWPyzbWH4DdKBQBOdcaguBu1Q8VXu/+arW5gHErCt9N2KhG3RN2geOwKPphyk/D
-EbbG1bJusJbf2Ldwiv1pBT2w/isBMuUctok2e8TJIPmVSlddCSzWqOjSXVwPTEU=
-=jlSY
------END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.11.0.jar.sha1 b/checkerframework/javacutil-3.11.0.jar.sha1
deleted file mode 100644
index ee02183..0000000
--- a/checkerframework/javacutil-3.11.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3329356cdd2b1dd8a4305c27ea9c9d511b41fa56
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.15.0-sources.jar b/checkerframework/javacutil-3.15.0-sources.jar
new file mode 100644
index 0000000..564a49e
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0-sources.jar
Binary files differ
diff --git a/checkerframework/javacutil-3.15.0-sources.jar.asc b/checkerframework/javacutil-3.15.0-sources.jar.asc
new file mode 100644
index 0000000..45e2adc
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0-sources.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgzR/yAAoJELFmmKSt9NY4wGEIAKaN/1b7enYbrfsaZshrhpsA
+F+Hmi21YY3Cl0hVITcToHW0Sj3TzZ42mEFq1Z+S7uEbtHc1lICogMPOWefTXHbwm
+UHVI2iGNHgIumMzdgwngZPvQflKYVJs5N10gXpw74Bk+nQ+E41cZxvnIXurqDKj+
+QXLcE2j5VqE6VhNns8g1usbdZBwe5l9YUJ5R8z6pRolcg7sGitfymUs8kh2h4Arm
+hXelZ7Q86pzhSaUbyio5VH2lI7uCCybaEyxUZycWgPQ9GatJbS80JZ3hlZ4J67oq
+CrGy7tPxjQ1NkAB85wPjeRfyrfavP60FCn6ELyR7LR9qU1taB8F8QcwBX0jgrgc=
+=ONLI
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.15.0-sources.jar.sha1 b/checkerframework/javacutil-3.15.0-sources.jar.sha1
new file mode 100644
index 0000000..482bd0a
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0-sources.jar.sha1
@@ -0,0 +1 @@
+ba716714cb8fe068fbaab8e87c8d6c62f10d3777
\ No newline at end of file
diff --git a/checkerframework/javacutil-3.15.0.jar b/checkerframework/javacutil-3.15.0.jar
new file mode 100644
index 0000000..601ca3d
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0.jar
Binary files differ
diff --git a/checkerframework/javacutil-3.15.0.jar.asc b/checkerframework/javacutil-3.15.0.jar.asc
new file mode 100644
index 0000000..26a21a3
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0.jar.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BCPG v1.64
+
+iQEcBAABAgAGBQJgzR/yAAoJELFmmKSt9NY4V2UIAJr9s2wBkWrf6x03MlTOs87j
+iZSSaWXVpbZiu/ZDBVCoZiW6NgE5N0E7rbgCqb2HFNXvfLt3sD9JcENVpilGBnVE
+slIStEfhZAdzOMlGGBFsiKbzqjHxUMtdk69/MVlaYFpbNxRWakA6I+ORwouN2AXC
+1tzBSqN8QOgaSenN6JSdAVd8mf4ctiBXqntG2+zE49CjxD31W945TG3o2fm493ph
+8VxnM/h1ZMaBYboG5o+ERt06kg13djOAWgqCo10at3lSQlUqMZg+oZODUtJ22kBv
+gdBCHAwGdTaK46UZXjpxichVmGs9urrICjlAXy9T3qc5/ZzGY18i9xITcqr1fXg=
+=BSMt
+-----END PGP SIGNATURE-----
diff --git a/checkerframework/javacutil-3.15.0.jar.sha1 b/checkerframework/javacutil-3.15.0.jar.sha1
new file mode 100644
index 0000000..8ed9c68
--- /dev/null
+++ b/checkerframework/javacutil-3.15.0.jar.sha1
@@ -0,0 +1 @@
+6bab34878391ed9af57cfa3dbfa56082e89d25b1
\ No newline at end of file
diff --git a/error_prone/METADATA b/error_prone/METADATA
index 019607f..7ce0737 100644
--- a/error_prone/METADATA
+++ b/error_prone/METADATA
@@ -10,8 +10,8 @@
   }
   url {
     type: ARCHIVE
-    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.7.1/error_prone_core-2.7.1-with-dependencies.jar"
+    value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/error_prone_core/2.8.1/error_prone_core-2.8.1-with-dependencies.jar"
   }
-  version: "2.7.1"
-  last_upgrade_date { year: 2021 month: 6 day: 16}
+  version: "2.8.1"
+  last_upgrade_date { year: 2021 month: 8 day: 18}
 }
diff --git a/error_prone/error_prone_annotations-2.7.1.jar b/error_prone/error_prone_annotations-2.7.1.jar
deleted file mode 100644
index 8ea5377..0000000
--- a/error_prone/error_prone_annotations-2.7.1.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.7.1.jar.asc b/error_prone/error_prone_annotations-2.7.1.jar.asc
deleted file mode 100644
index 5a6960e..0000000
--- a/error_prone/error_prone_annotations-2.7.1.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAhUACgkQmiWcfuY2
-xe3I6w/+JHJGbwRUpSw/+lu6OVxU8dezW5/UUIz/UA82cNDsP5lpIBN4XNBrKAGk
-MwlFi+rP12FyIfUkIuYzhd0RerdWAdJMjF/Ap5Fy7kRxIexa7jPDAl17EmLpraUd
-4O+OxFPUOku3XAgpKEuF5WoZmPJmzqB53hymDP53s3603WgCLCsCEzf+h8M1hinI
-Nkaw8m6V8bbuecNQQXjVHjGxubS+owLKfzK3GPNcPttVMNUgCQ2qI9ijbIzZP7Ua
-u5iJhSJXsrAtiQA3DddTtphi0MFWmPFBCj0xyBYqKWG6rIkYLPCv6ytlyQRCSZ5s
-+M83hvZKmVdkYsxuMt2SY/OyWIoxGsJ1C5PdNGXjp9xArtc+p7L+EXKkv0SZuvf6
-mogpGsLaEuoVdmDWemC5piEBxgE3lZl3axf1pQfUfSjZH1d1IQdr3eYgFjZuPbwn
-rTJLU1denCyin0Z/k8+nc7dSyH8VGlmN75UBx05mQU18syfdoO85Jp34JHVgYv4U
-OsQYLLCSZlQ4IduBT1AdtevZNkVkavjMjtFsneYuWcCsHabFzep7iogcT7WNb6Ve
-2PhaSWZW9zzW7+qOR2vpqU5uBLjU+5L4XbmUqrQf+iAPU5aDVKwMJEzq0wy4/KaT
-6SVEZRBxI81Vta38Y+aGWvMv1rkzbqhgN52Ko4J1uyQPL2F33D8=
-=RZbr
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.7.1.jar.sha1 b/error_prone/error_prone_annotations-2.7.1.jar.sha1
deleted file mode 100644
index 398b7b8..0000000
--- a/error_prone/error_prone_annotations-2.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-458d9042f7aa6fa9a634df902b37f544e15aacac
\ No newline at end of file
diff --git a/error_prone/error_prone_annotations-2.8.1.jar b/error_prone/error_prone_annotations-2.8.1.jar
new file mode 100644
index 0000000..106baea
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.8.1.jar
Binary files differ
diff --git a/error_prone/error_prone_annotations-2.8.1.jar.asc b/error_prone/error_prone_annotations-2.8.1.jar.asc
new file mode 100644
index 0000000..cde03d1
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.8.1.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlQ8ACgkQmiWcfuY2
+xe3oBhAAhrXJHf/gqz65a9Ol/Vo/yanBBvDRX3lwUEd3hPgd5FaTUOZIoRlJT4a+
+HMgbM02jNPNs3ZDKqkt8DG8jfpYTdIoNiDpD1wNDwuwmqrhztaGQ5KKS2imPcMSc
+Ub6oGwiFQV4ryEaMM8fB8Bc1+Ok+D2o7mPd2jnfUGFuQW3sWzLMEij4XktkudxUl
+eRWvfVFy2pwlcv1r91F1NC3JoCLBwXDc/Vd0GIlI/PC4HQouKrIvAxUOr1aj/qQK
+Dfq3VvKtqgGKdhzkFPd23P3u+dVK/pZ96LJYieVVfjO7BS0m75q9IoJVSBvUoNL7
+/+qS2TaIUONgHLvNq8jXG1XnfN5qewicKlYSLquYy33NDmsyyswvcEZLQugN9hHe
+MIHFjRvK6sn/OcSMHTgQ5bj0Uh7RQ0MxzsXMfV+qAhg5YxvsabPiOIAGU2FnaU3f
+B/OBF0/wsgiI2dCatZ+dU4U3SCgjU2KT6w+hItaLW+RSWgZlDtZrD824bWhwszun
++Gr0cyuKzJjwsdc6UhcS7vqckQTv9BTdUhjrsdKE9k0GDk5J/tzJD8kTRtUfbYZh
+wDqFbTMVNAjfTaghhWTQdqPkv5iguJICIFPKQtQLrPaeHFBuOtqeDkdAAqqLtvYK
+c5rQ2k5ys7S6ZTy3OPdgR6sqhPGnbliUncK5VSIYRp8HnLUygXg=
+=8x6+
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_annotations-2.8.1.jar.sha1 b/error_prone/error_prone_annotations-2.8.1.jar.sha1
new file mode 100644
index 0000000..cb2b645
--- /dev/null
+++ b/error_prone/error_prone_annotations-2.8.1.jar.sha1
@@ -0,0 +1 @@
+bbfa4bdfe7377126947f1469bc7b0bbb4d9dbb95
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.7.1-with-dependencies.jar.asc b/error_prone/error_prone_core-2.7.1-with-dependencies.jar.asc
deleted file mode 100644
index 7d016e1..0000000
--- a/error_prone/error_prone_core-2.7.1-with-dependencies.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAsgACgkQmiWcfuY2
-xe2hOg//V7um0fDaIlHPKZATZfK7cLaAUe2u8HhShvUD+4+fdlFIH1us5mE26QR6
-v+OofgOagy7HLDN/jKU5b3tDPQdh2D8vHIBOu1m8QRGjgLkYs1uwXpBifDWyCpOb
-QQ2ThkHSxpTQofxh+RvNB1axuFSbqgXi2NbObbaPhVyLjcc2LbPghv7G1kbXBF5a
-Zid9tbf4Ezq5zhMf9YLMDXC4Xb6OMDCtCUAeSlKUBE39QbiiGa9++NAaL3bHvq3r
-UDbXQn3/9r5/6+NP7V3YkXH5cSPhkuvGDziJlMiGS/mmYQaUszCvyUuMBoYAeGno
-S4OGdhc8UNapwI8yLRLbSqPGvhhG+9aOBZqWFa4VkM1BmP+WLaVvq6JcPWoPKIiQ
-XTQuWru0ec19y3ULFnOsKilPgUu/wCMUofXiv+mA9tJROkyUfMqF8n5A95WqOsDF
-FAs1dtZ1/N/gIhem0Ze6KF/2zFS5vuaFdG3bXFvSUevQyNyWQZ9vkyEJNfG4zKgC
-NKy4C9lOiIZYKlJHst78N2QrRT/PliUUhAcMYLmWXBUWoP1IkI/MVu1RVQODe30M
-yO3BQMYG0IFGLkIuKTTWb6UaUbhMzkYyI5Z2USbCRZ1Hs8i6SI+KfurxwYjBWJRM
-z34nL/k98iFjrJaKqMsncYNGKFsVcSIitO8ig2/qfwP/0qojK/c=
-=5k+G
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.7.1-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.7.1-with-dependencies.jar.sha1
deleted file mode 100644
index 515f691..0000000
--- a/error_prone/error_prone_core-2.7.1-with-dependencies.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d1a7e0479262bb4b7f3a33cbd189abb5369488aa
\ No newline at end of file
diff --git a/error_prone/error_prone_core-2.7.1-with-dependencies.jar b/error_prone/error_prone_core-2.8.1-with-dependencies.jar
similarity index 81%
rename from error_prone/error_prone_core-2.7.1-with-dependencies.jar
rename to error_prone/error_prone_core-2.8.1-with-dependencies.jar
index f0a64be..b0ab3b1 100644
--- a/error_prone/error_prone_core-2.7.1-with-dependencies.jar
+++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar
Binary files differ
diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc
new file mode 100644
index 0000000..9a7d497
--- /dev/null
+++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlZYACgkQmiWcfuY2
+xe3YHw/+Jf0H26yaSz/kqn7qv+nMP2BBz3d9SD44kLZFNKorsTeSHjgQ7VGDJ4bQ
+G+1bQVX5r2rB/OVQRKCNMoE8Jznnz9+tzEUNBhjvBykpUIrKN705BJGBegrOcAa2
+Nda42UYTMnGtdxc8VLb1iQB6eRS6yJNwgfoBvnTzHQiOh5gGdCvxjzSlyVN9pFUx
+0tkI6KUZvA3jiPOsZYvegkYbmmmm5JYkgp2BP5n6tU7wIm9MxetyBjbCk4mMVMst
+zXrhnVuqAtTp8LjCiJDzIneGyfXZ041Z/skcm4EwfFNga98NynP3gIB9Tp9J7GmX
+7sZKqEuPLyfI67J3pUKaDDc8HdTyKFVf7lBZvwf+w2TaUQkVAPyv95Ug+w6YbYvn
+LBcHq/cfRRhY/1EPBs/SK2gOnloVpcB1XKLJR+eTBF/GYGcUfuUqTUUkae7oc1gd
+GHbW6qi1SjhhtHswyKxkEJPLqNlLm46c5YqSwwk9Q3EsY2RkM0kXVLxlNg//MWrI
+RFubSY6WsPqPXIqAwQCrYAIffIbBanBMCi+YSstnKQp36SY6+xUeaVjbPv1AvmCI
+50/cW3Yl0oNnVbvT9Y+eiUD2R3W2ZF1lQYTLv1RsTTWvGWw3YKgaEQxQEkIUefds
+hkWwWklRR+nJHneMvDskFnyAx+7dKcN7y+ZGMechuTQ6FYRFIjc=
+=gvtA
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1 b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1
new file mode 100644
index 0000000..b67c43c
--- /dev/null
+++ b/error_prone/error_prone_core-2.8.1-with-dependencies.jar.sha1
@@ -0,0 +1 @@
+e050e357440d8bb832183816c4f4fc8b2feeea26
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.7.1.jar.asc b/error_prone/error_prone_test_helpers-2.7.1.jar.asc
deleted file mode 100644
index bf503c8..0000000
--- a/error_prone/error_prone_test_helpers-2.7.1.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAkgACgkQmiWcfuY2
-xe3mjw/5AWnOnKm8vO52jFEC2YiyS5DEorEvZUz6xPpUJVlGnN+wXDauj7DGb9vT
-KoZnUK8vQPFdLiZoqmeopFSB58AYkvca2UxL75wdFv7mHZNSW2ZpXfcpVwtKkx0R
-pl9JA1GnEvVyVhaAre9/hOBv18ONxBfblPHZOwDZh+prIgHZQ4nl1hMrF483Y4/X
-oJu3LVXxS5lhuRo0MuiLwo8SBa/26lZKMjpFbDHX7vcZQghZP6+FgS270ot6jX7O
-nontAufBrATxwVCE1/P8Tm7qL0WScuyWmAZTkDxVkvJQ2pXsnCS8+R89NfsiBWF5
-cOYW7F1kGEaqX0SA191NiZ4j6s+4w9rzCTi0GJLRW/YjYPQjxjombcrcczALRere
-gUBXGa12K4pd/xtppr7uHDmDDp6eFMOqGIQOWoSZLEs/zVT6aBd7lStFVRt1A6Yd
-J/rQVqvv5iex7RG1vq9IgqS53L/3l/qJVDa1t0RyqKtmvxmyhEwmL0QkNEhkh8Vg
-0nM0SD/mS3j+sfaLg97qfEvBHjmusQhbLggFhtNp2L/yvFeILbm57AKztUnTE7kN
-bwOcZBwdCdm5nBb4T0vz5REXxem0JDyIWfHV1o+sbtq5UqDQMVYeu8HpuQxUmSFa
-cOYcZ2pyUaZWsknxQfHIIFba2Dxq6gcDBAD4vsKq3H23q8g59lk=
-=FHx/
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.7.1.jar.sha1 b/error_prone/error_prone_test_helpers-2.7.1.jar.sha1
deleted file mode 100644
index d10b284..0000000
--- a/error_prone/error_prone_test_helpers-2.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-98b373ee9228679f40cfb0558c254e4e22850d1d
\ No newline at end of file
diff --git a/error_prone/error_prone_test_helpers-2.7.1.jar b/error_prone/error_prone_test_helpers-2.8.1.jar
similarity index 75%
rename from error_prone/error_prone_test_helpers-2.7.1.jar
rename to error_prone/error_prone_test_helpers-2.8.1.jar
index 26a1bd7..9771492 100644
--- a/error_prone/error_prone_test_helpers-2.7.1.jar
+++ b/error_prone/error_prone_test_helpers-2.8.1.jar
Binary files differ
diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar.asc b/error_prone/error_prone_test_helpers-2.8.1.jar.asc
new file mode 100644
index 0000000..fbae2b3
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.8.1.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlSgACgkQmiWcfuY2
+xe3JfA//dDa2vy0XjV67wdGUa93SCxxmlhw45UxfguX8DG54+0T5SSHgv5oIJH+2
+Uynr9m9ZWlX4yXvUJ9FfRXZmGyzUK0A9SRV6eQQhqpfmqih/b92Sk2IDNJImhAcq
+BJQ6XWhyOEYoTB+NV5pgy3318JxLbF8NIUa1HGMjfCu9ZAQZmv+5W0+v+CehvLJU
+6/QW3Nwo/AlcPVr63u/CLanrmyZd5rNkMnJt0he4nMqfswqFY0Zi3YQjSWCu5raD
+4XT9KFeGz38RlpkCuCDAiQDLd2Mw/jtA0lw8oL7qIjrVNIzZ+oT7Nv7MV3wkvGWD
+P1bdeP+/L/E5hnNtOCSJPK3vdVvH7O1WB18RFVIyonzBFZVqIhYji/A5di+h3uRV
+bRQEXbw3eJLcMGUK3b4HIx2uIzEQxpVNDWViNSapPASUeaXSYEQWTW1dQPnJulOK
+ia7Vk6see4RQnX7A3OVXkCf8+q3ko5UZuTBV5M7a59QLiWH6ZyLpe7lJht/encXZ
+VrQKLokpFesqO+AxPsRgImaCCb94WkJi9ViHvBGlJz23bXsXGIbrWmlc/g0e3pRF
+CMlRSZpeX2jnoIcDkAjJB0s+2OWRI4XQUZjL7w4c/C1pR084lrdYQDe1OvGXsIQ9
+ycDqR9pti6l3ECf2epZTp5VOhXF2hhecWusAf8TepBx80DF9d7k=
+=91bf
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_test_helpers-2.8.1.jar.sha1 b/error_prone/error_prone_test_helpers-2.8.1.jar.sha1
new file mode 100644
index 0000000..5705fc3
--- /dev/null
+++ b/error_prone/error_prone_test_helpers-2.8.1.jar.sha1
@@ -0,0 +1 @@
+e9f1223156bdb02b7ffce3e1790c996d8f8fd368
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.7.1.jar b/error_prone/error_prone_type_annotations-2.7.1.jar
deleted file mode 100644
index af6ac61..0000000
--- a/error_prone/error_prone_type_annotations-2.7.1.jar
+++ /dev/null
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.7.1.jar.asc b/error_prone/error_prone_type_annotations-2.7.1.jar.asc
deleted file mode 100644
index 284f698..0000000
--- a/error_prone/error_prone_type_annotations-2.7.1.jar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmCfAlQACgkQmiWcfuY2
-xe2gxw//QW/K+VUCtpGZP9MZFcZIM7G20Z5t7F0Ags3eQB30UYZ+3wJStTWUQzfL
-mh+cKWF59KiqPJPhSYFmHt702au4eVn0GzyN77+vzB/rw5WVTz/qUuKZ/NdpPMVj
-lqCnoL+Lgjpc/rvD9F/kC8Xag7fSecOnk+afqCbgGNeS1jdU+PEWEKEbN+33vOE+
-m9bDMCZ80LGt4UDj5jv9xyYVSSt9vKTe1K9e42UGAyEKtlsMkSnIYv9BZwtJGhX+
-egithecxHHFoSgGqYQk/6KLyjGS2tC/JFopRToiK4abnhI598EvnLNR6MAvwZ816
-CbsukCdUd9Wo/re4R1PDi7/rVIqkz+u8g0uFxuNDOYyR5bMKxmMBmL9Zy3LcvKmT
-szAKSaTkUXN6Q+/R4LLfdLcU76oDsKZwH0i8U4BJf2VBQkTaqUg8Am2QQray50DS
-sla5dWFvcmHUH4EIRv8vM9NHOcUVuf5py7Th7r4dhh9/OftZyjBGff44Bp3hZG/F
-CxCrMyGylPqnepktveY0CSZEO92CR8gtnuHYTakXJPsO4jCIOq2n6G7Y9Aj2O3vU
-XTcXmuw/scCh/3OGK/Q0P50P8p7j+rBSthv3vRjdAWa+NUjGU7o4JeVzMGQ3IoST
-DyhzYFxdQ+xDHbpBAn1UYrnZZaQ1CYrKwhnH0eCAB6vOfQP6BYo=
-=/KaH
------END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.7.1.jar.sha1 b/error_prone/error_prone_type_annotations-2.7.1.jar.sha1
deleted file mode 100644
index 341af7a..0000000
--- a/error_prone/error_prone_type_annotations-2.7.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d24ac6464d955ae28431e1fc71f80e2de1bcffc2
\ No newline at end of file
diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar b/error_prone/error_prone_type_annotations-2.8.1.jar
new file mode 100644
index 0000000..9e1f977
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.8.1.jar
Binary files differ
diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar.asc b/error_prone/error_prone_type_annotations-2.8.1.jar.asc
new file mode 100644
index 0000000..d63548d
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.8.1.jar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE53QXrBlBYKP6vQSWmiWcfuY2xe0FAmEJlS0ACgkQmiWcfuY2
+xe17LQ//Xo20fPWdOawZueraYBP0Etr9x1MP3guyfnNNfBX2y2+OsK6TeWMAc17k
+1nGxwe+GmVFYNxdBf3k08gBG6v3zRDiBbNb9EGz6Aq+WZGuAD0Wm5MMSPboYIvW8
+L3dhbSjrPiNmUaj9jt+BxlceYLAeWLlM7hUbjm3mZa7PZmCxePtsV3A5nLHyhsbw
+kfb4AzFOCteSQvw+PyrEhqbIqHL6HCR1VkQd0VE0s4epbaLMdA4e311fhv3Y9A2D
+S4ygjd5bkdmOLPTVTwZwxClcdjmFF6ccCFnU9doXrhHCHH4u1JcLc+W5JSpY8ED/
+7t6MPa18ZwXwCxHDUaONPmI6dYrAU/RiGwwgjnuKzBkJx4G6xiGAshJ3eAvR11/N
+hINti3l0TgldByzLnIl9NFOvAeeK2BkazzjptbA4JYv5d1avgyxwPX21TRCtvFcV
+8bWugfTFq9a/XszJHrnm4rJxwOxZyemJ3EgUHQ5ANj/+VzCOWFlDbb0WmTCdH25J
+Dp2gBgNhdRvVwQQsafBA+nZjBjetN9Z/F9/hR8aSgFpXpQ4nAv5PZxFrkSF1VmtY
+ZD2khBUSwtmCuRAMj7JrSuZgVSCO9nr4rT52TDf9Yfs4UBAipAvhi0wnqllHATMw
+9FTY1GpK576rGN/lW5/a9S4JRxrKRYjOd/JaZjvmpT5W0Q3/1Xk=
+=YFoe
+-----END PGP SIGNATURE-----
diff --git a/error_prone/error_prone_type_annotations-2.8.1.jar.sha1 b/error_prone/error_prone_type_annotations-2.8.1.jar.sha1
new file mode 100644
index 0000000..4c5b947
--- /dev/null
+++ b/error_prone/error_prone_type_annotations-2.8.1.jar.sha1
@@ -0,0 +1 @@
+b81c055c7ba1a109a67164b597c5c51f74c7671e
\ No newline at end of file
diff --git a/javac/METADATA b/javac/METADATA
index be6255c..9036623 100644
--- a/javac/METADATA
+++ b/javac/METADATA
@@ -12,5 +12,5 @@
     value: "https://oss.sonatype.org/service/local/repositories/releases/content/com/google/errorprone/javac/9+181-r4173-1/javac-9+181-r4173-1.jar"
   }
   version: "9+181-r4173-1"
-  last_upgrade_date { year: 2021 month: 6 day: 16}
+  last_upgrade_date { year: 2021 month: 8 day: 18}
 }
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 72f219b..fec0b50 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -22,11 +22,11 @@
 	// These values are set into build/soong/java/config/config.go so that soong doesn't have any
 	// references to external/error_prone, which may not always exist.
 	config.ErrorProneClasspath = []string{
-		"external/error_prone/error_prone/error_prone_core-2.7.1-with-dependencies.jar",
-		"external/error_prone/error_prone/error_prone_annotations-2.7.1.jar",
-		"external/error_prone/error_prone/error_prone_type_annotations-2.7.1.jar",
-		"external/error_prone/checkerframework/dataflow-shaded-3.11.0.jar",
-		"external/error_prone/checkerframework/javacutil-3.11.0.jar",
+		"external/error_prone/error_prone/error_prone_core-2.8.1-with-dependencies.jar",
+		"external/error_prone/error_prone/error_prone_annotations-2.8.1.jar",
+		"external/error_prone/error_prone/error_prone_type_annotations-2.8.1.jar",
+		"external/error_prone/checkerframework/dataflow-errorprone-3.15.0.jar",
+		"external/error_prone/checkerframework/javacutil-3.15.0.jar",
 		"external/error_prone/jFormatString/jFormatString-3.0.0.jar",
 	}
 
diff --git a/update.sh b/update.sh
index f34394f..c5c4af9 100755
--- a/update.sh
+++ b/update.sh
@@ -20,8 +20,8 @@
 EP_TEST_HELPERS_JAR_URL="${JAR_REPO}/error_prone_test_helpers/${EP_VERSION}/error_prone_test_helpers-${EP_VERSION}.jar"
 JAVAC_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}.jar"
 JAVAC_SOURCES_JAR_URL="${JAR_REPO}/javac/${JAVAC_VERSION}/javac-${JAVAC_VERSION}-sources.jar"
-CF_DATAFLOW_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-shaded/${CF_VERSION}/dataflow-shaded-${CF_VERSION}.jar"
-CF_DATAFLOW_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-shaded/${CF_VERSION}/dataflow-shaded-${CF_VERSION}-sources.jar"
+CF_DATAFLOW_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/${CF_VERSION}/dataflow-errorprone-${CF_VERSION}.jar"
+CF_DATAFLOW_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/dataflow-errorprone/${CF_VERSION}/dataflow-errorprone-${CF_VERSION}-sources.jar"
 CF_JAVACUTIL_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}.jar"
 CF_JAVACUTIL_SOURCES_JAR_URL="https://repo1.maven.org/maven2/org/checkerframework/javacutil/${CF_VERSION}/javacutil-${CF_VERSION}-sources.jar"
 TOOLS_DIR=$(dirname $0)
@@ -68,7 +68,7 @@
   update_jar "${CF_VERSION}" "${CF_JAVACUTIL_JAR_URL}" "${TOOLS_DIR}/checkerframework"
   update_jar "${CF_VERSION}" "${CF_JAVACUTIL_SOURCES_JAR_URL}" "${TOOLS_DIR}/checkerframework"
   perl -pi -e "\
-    s|\"(external/error_prone/checkerframework/dataflow).*\"|\"\\1-${CF_VERSION}.jar\"|;\
+    s|\"(external/error_prone/checkerframework/dataflow-errorprone).*\"|\"\\1-${CF_VERSION}.jar\"|;\
     s|\"(external/error_prone/checkerframework/javacutil).*\"|\"\\1-${CF_VERSION}.jar\"|;\
   " "$TOOLS_DIR/soong/error_prone.go"
 fi