Merge "Track libcore change 2c423c81bfa731df2577a."