am d557614f: am f016fa63: Merge change Ib1f7c3cb into eclair-mr2

Merge commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2'

* commit 'd557614f3a8b5e25c9e1160bb28b4bdc7850c1c2':
  Make vCard composer use Base64 class for encoding String into bytes instead of using its own implementation.