Merge change Icf3aa797 into eclair-mr2

* changes:
  Clean-up ImportVCardActivity and ExportVCardActivity