Snap for 4590521 from 2e52c68711b104ac2e225a9d298bd2de1eed92bb to pi-release

Change-Id: I493fbf016730d614a4dded870c6b988dc05e6d90
diff --git a/Android.bp b/Android.bp
index f31fda1..f5108e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
     name: "guava",
     host_supported: true,
     hostdex: true,
-    sdk_version: "9",
+    sdk_version: "core_current",
     srcs: ["guava/src/**/*.java"],
     static_libs: ["jsr305"],
     java_version: "1.7",