am e5cf479d: am d40c41df: Merge "Track libcore changes."

* commit 'e5cf479deb47ef523c521c23f1fbbaa2171ff370':
  Track libcore changes.