Merge "Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master am: 6f15eabd29" into nyc-dev-plus-aosp am: 8fa05abfab
am: 1bdb989749

Change-Id: Idaf854c4ab3a213af17886e2534b10c38d1cef0f