Merge "Track libcore change aa517a356a38b8cd6764667e1edd735aaf5978e9."