am ca103c16: Merge change I6ce46417 into eclair-mr2

Merge commit 'ca103c16d80aba1a9535e2eb4e13283258426395' into eclair-mr2-plus-aosp

* commit 'ca103c16d80aba1a9535e2eb4e13283258426395':
  Clean-up vCard code.