am e88fe7f4: am 94fed1c5: Merge "Track libcore API update."

* commit 'e88fe7f415334ae04a289f8bc697404212784df0':
  Track libcore API update.