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