Track libcore API change.

Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
Merge "Track libcore API change."