Merge "Track libcore change aa517a356a38b8cd6764667e1edd735aaf5978e9."
am: a2e599ab7c

* commit 'a2e599ab7c74ec6bb61c17ff9182827a366c2dc5':
  Track libcore change aa517a356a38b8cd6764667e1edd735aaf5978e9.