am 94fed1c5: Merge "Track libcore API update."

* commit '94fed1c5d570a92d357657451e5b47aba4feee12':
  Track libcore API update.