Snap for 4590521 from c67195927f579fb8a7fda44815b189e4c0ecf58f to pi-release

Change-Id: Ica27e523fae0752db35e92ac6479cd38d077f203
diff --git a/Android.bp b/Android.bp
index 7d92bc7..b0e24e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,7 +19,7 @@
     host_supported: true,
     hostdex: true,
     srcs: ["src/main/java/**/*.java"],
-    sdk_version: "25",
+    sdk_version: "core_current",
     static_libs: ["hamcrest"],
 }