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

Change-Id: I2d1c8a229ae7179f3ac28048349c0f89d129c46c