Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2 am: 17fea8b967 am: 8fc0ac9b39
am: 9354783343

Change-Id: I0ed4962659511452c73f93747faf2abe447d92a4