Merge "Remove perfprofd references."