Update Espresso to be compatible with guava-20

third_party/espresso/BUILD.gn

Index: third_party/espresso/BUILD.gn
diff --git a/third_party/espresso/BUILD.gn b/third_party/espresso/BUILD.gn
index 7387e5938edab7cbf6ff4158f4497e39f1f887b2..105ef881d9532338c687916947705d0b8c8479b2 100644
--- a/third_party/espresso/BUILD.gn
+++ b/third_party/espresso/BUILD.gn
@@ -17,7 +17,7 @@ java_group("espresso_all_java") {
 
 android_java_prebuilt("espresso_contrib_java") {
   testonly = true
-  jar_path = "lib/espresso-contrib-2.2-release-no-dep.jar"
+  jar_path = "lib/espresso-contrib-2.2.1-release-no-dep.jar"
   deps = [
     ":espresso_core_java",
     "//third_party/guava:guava_java",
@@ -27,7 +27,7 @@ android_java_prebuilt("espresso_contrib_java") {
 
 android_java_prebuilt("espresso_core_java") {
   testonly = true
-  jar_path = "lib/espresso-core-2.2-release-no-dep.jar"
+  jar_path = "lib/espresso-core-2.2.1-release-no-dep.jar"
   deps = [
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/guava:guava_java",
@@ -38,12 +38,12 @@ android_java_prebuilt("espresso_core_java") {
 
 android_java_prebuilt("espresso_idling_java") {
   testonly = true
-  jar_path = "lib/espresso-idling-resource-2.2-release-no-dep.jar"
+  jar_path = "lib/espresso-idling-resource-2.2.1-release-no-dep.jar"
 }
 
 android_java_prebuilt("espresso_intents_java") {
   testonly = true
-  jar_path = "lib/espresso-intents-2.2-release-no-dep.jar"
+  jar_path = "lib/espresso-intents-2.2.1-release-no-dep.jar"
   deps = [
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/guava:guava_java",
@@ -53,7 +53,7 @@ android_java_prebuilt("espresso_intents_java") {
 
 android_java_prebuilt("espresso_web_java") {
   testonly = true
-  jar_path = "lib/espresso-web-2.2-release-no-dep.jar"
+  jar_path = "lib/espresso-web-2.2.1-release-no-dep.jar"
   deps = [
     ":espresso_core_java",
     "//third_party/guava:guava_java",