Merge RP1A.191024.001
Change-Id: I79f322a6170d9f6e8ebc1850984c9167d4858450
diff --git a/OWNERS b/OWNERS
index a174a1c..0c80261 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,3 @@
-# This project does not seem be updated for 5+ years.
-# Please update this list if you find better candidates.
-jeffbailey@google.com
-rtenneti@google.com
-enh@google.com
+# Bug component: 24949
+include platform/libcore:/OWNERS
+
diff --git a/hamcrest-core/Android.bp b/hamcrest-core/Android.bp
index da980d8..6cb02ce 100644
--- a/hamcrest-core/Android.bp
+++ b/hamcrest-core/Android.bp
@@ -20,4 +20,9 @@
hostdex: true,
srcs: ["src/main/java/**/*.java"],
sdk_version: "core_current",
+
+ // Pin to Java language level 8. It is loaded by an OpenJDK 8 runtime from
+ // prebuilts/studio/jdk in frameworks/layoutlib/bridge/tests/run_tests.sh.
+ // See b/141970724.
+ java_version: "1.8",
}