Merge \"libcore: add package-info.java for java.util.function\"
am: 0d9db9ff82

Change-Id: I0686d1a7fc07f138127893bba368d973b233bcab