Snap for 10447354 from b39db028c29de6e95c5cc7c7d17f9955927ae791 to mainline-wifi-release

Change-Id: If059fff02c35ad2205beea19f55d5243118c1e0f
diff --git a/Android.bp b/Android.bp
index 36732ae..ee27cdd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,8 +17,8 @@
     main_class: "com.android.manifmerger.Merger",
     static_libs: [
         "manifest-merger-jars",
-        "guava-21.0",
-        "gson-prebuilt-jar",
+        "guava",
+        "gson",
         "kotlin-stdlib",
     ],
 }