Merge "Fix build after copy of ContactsCommon dirs to Contacts" into ub-contactsdialer-g-dev