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

Change-Id: Iafd93f9ebbe74b34359d0d83e0aaca2013d19a4b