Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master
am: 6f15eabd29

Change-Id: Ic1c3c789ffdc7b9d1f59faea6292c8f3489e8ad4