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

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