Merge "Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp am: 8fa05abfab" into nyc-mr1-dev-plus-aosp