Merge "Track libcore API changes."