Merge "Track libcore change 13331bc0dd87b029b194e5aca4487e38d18da188" into nyc-dev-plus-aosp