Merge "Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33."
am: 61d71016a9

* commit '61d71016a9dc6ce61ed7fb251b0e9eb83492140d':
  Track libcore change e86a81ca1ae9ddbdd1c3239d31fb2e49b4a5cf33.