Snap for 4590521 from 6668c743790380cb3e7889c2abb6cd53b720a211 to pi-release

Change-Id: Icfe42e06faa0056a7b7c33e81ad976667515fab5
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
index 711ebfe..da980d8 100644
--- a/hamcrest-core/Android.bp
+++ b/hamcrest-core/Android.bp
@@ -19,5 +19,5 @@
     host_supported: true,
     hostdex: true,
     srcs: ["src/main/java/**/*.java"],
-    sdk_version: "25",
+    sdk_version: "core_current",
 }
diff --git a/hamcrest-library/Android.bp b/hamcrest-library/Android.bp
index c91c7c6..b91fb99 100644
--- a/hamcrest-library/Android.bp
+++ b/hamcrest-library/Android.bp
@@ -20,5 +20,5 @@
     srcs: ["src/main/java/**/*.java"],
 
     libs: ["hamcrest"],
-    sdk_version: "8",
+    sdk_version: "core_current",
 }