Merge "Track libcore update of Map classes to jdk8u60."