am c5de9c35: Merge "Track libcore API update."

* commit 'c5de9c3509e6f91f1a6fca4541c5a2dfc9878dcc':
  Track libcore API update.