Merge "Track libcore API update."