Merge "Track libcore changes."