Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe am: 900471ab11" into nyc-mr1-dev-plus-aosp