Revert "Revert "Track libcore update of Map classes to jdk8u60"" am: 7f5095ddfe
am: 900471ab11

Change-Id: I14364e0805996c1bfe37e607bd58f35bd51101c8