Merge "JSR-166 update without java 1.9 method/classes"