am a9510297: am 505974eb: Merge "Track libcore API update."

* commit 'a9510297a656c574d063b299f044bc9893af7724':
  Track libcore API update.