Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29
am: 150ab094ed

Change-Id: If378d5a5759462ffef5c45907b7f08328ee696c0