Revert "Track libcore update of Map classes to jdk8u60" am: 7783213611
am: 5efe2b7515

Change-Id: Ic9386c17ec28b68de3127057eafbc60399e44f47