Merge "libcore_private.stubs cannot be built with JDK9" am: 6b330b5a7a
am: 46b04d878e

Change-Id: I40920dc687b94dd55b089b96a98a0c9a60c4220f