Merge "Revert "Add java.util.function APIs""