Revert e148a678

Fix the gradle problem

PiperOrigin-RevId: 416011494

constants.gradle

@@ -25,7 +25,7 @@ project.ext {
     junitVersion = '4.13.2'
     junitVersion = '4.13.2'
     // Use the same Guava version as the Android repo:
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
-    guavaVersion = '27.1-android'
+    guavaVersion = '31.0.1-android'
     mockitoVersion = '3.12.4'
     mockitoVersion = '3.12.4'
     robolectricVersion = '4.6.1'
     robolectricVersion = '4.6.1'
     // Keep this in sync with Google's internal Checker Framework version.
     // Keep this in sync with Google's internal Checker Framework version.

library/common/build.gradle

@@ -27,6 +27,7 @@ dependencies {
         // (but declared as runtime deps) [internal b/168188131].
         // (but declared as runtime deps) [internal b/168188131].
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
         exclude group: 'com.google.code.findbugs', module: 'jsr305'
         exclude group: 'org.checkerframework', module: 'checker-compat-qual'
         exclude group: 'org.checkerframework', module: 'checker-compat-qual'
+        exclude group: 'org.checkerframework', module: 'checker-qual'
         exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
         exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
         exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
         exclude group: 'com.google.j2objc', module: 'j2objc-annotations'
         exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
         exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'