Merge "One more set of libraries to remove for cleaning up after the header rename."