Merge "Add java.util.function APIs"