Hand merge from cupcake_dcm to donut, part 2.

Modify Contacts-related java files and update vCard importer code to the latest.
17 files changed