am f094eefc: am c5de9c35: Merge "Track libcore API update."

* commit 'f094eefc34013c7167effa558b488709eaa54751':
  Track libcore API update.