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

Change-Id: Ic85482c07f79bc249b46d7d2a49243ef0a5b148d