am 5216f11e: Merge "Track libcore API update."

* commit '5216f11e462b9f17704c0ac9e193d2149f3fa755':
  Track libcore API update.