Merge "Refresh of upstream JSR166 code"