Merge "Apply upstream OpenJDK 9 compilation fix to JapaneseDate."