Merge change I4c05ba1f into eclair

* changes:
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf