Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2 am: 17fea8b967
am: 8fc0ac9b39

Change-Id: Ia814e0be0e66022a373c8a8e4bc27a71ce85d866