Snap for 4590521 from 628ced18e817a96c11857a51536468a886c6e183 to pi-release

Change-Id: If5686e4fbadb420c3192f4bac9f003308fb3b254
diff --git a/Android.bp b/Android.bp
index 57f5e1c..154cee3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -96,6 +96,7 @@
     name: "guice",
     host_supported: true,
     hostdex: true,
+    sdk_version: "core_current",
     srcs: [":guice_munged_srcs"],
     static_libs: [
         "guava",