am 7c56325d: am c26e5505: Merge "Track libcore API update."

* commit '7c56325d57c3c6022cfcb9b71343751c572bc656':
  Track libcore API update.