Merge "Track constructor changes in libcore/"