Merge src/com/android/contacts/common/ from platform/packages/apps/ContactsCommon to src/com/android/contacts/common/