am d40c41df: Merge "Track libcore changes."

* commit 'd40c41df0044a155b68f3c6b21ec08bc64f5b6c7':
  Track libcore changes.