Merge change Icaf78440 into eclair-mr2

* changes:
  Split vCard composer into two parts: VCardComposer and VCardBuilder.