am 4f81eac4: Merge change I27b1bb90 into eclair-mr2

Merge commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09' into eclair-mr2-plus-aosp

* commit '4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09':
  Refactor vCard test code and modify unit tests.