am b37652a2: Merge "Track libcore API changes."

* commit 'b37652a297fa3795b03823db3edd5d9d30a43259':
  Track libcore API changes.