Merge "Track libcore cleanup."