Properly merge contactsd into commhistoryd.