am 70b74646: Merge "Track libcore changes."

* commit '70b74646b8114b7ee9e35ce4283ecab8c8528dcc':
  Track libcore changes.