Fix build after copy of ContactsCommon dirs to Contacts
am: a6fb6d2b6f

Change-Id: I437c35c82b61d684433a3780f6abc9fe509e2c05