Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33."