Snap for 4590521 from 6668c743 to pi-release

Change-Id: Icfe42e06faa0056a7b7c33e81ad976667515fab5

hamcrest-core/Android.bp

@@ -19,5 +19,5 @@ java_library_static {
     host_supported: true,
     hostdex: true,
     srcs: ["src/main/java/**/*.java"],
-    sdk_version: "25",
+    sdk_version: "core_current",
 }

hamcrest-library/Android.bp

@@ -20,5 +20,5 @@ java_library_static {
     srcs: ["src/main/java/**/*.java"],
 
     libs: ["hamcrest"],
-    sdk_version: "8",
+    sdk_version: "core_current",
 }