Merge "Track changes in libcore to remove a constructor"