am 56150748: Revert "Use scan mode introduced in VCardParser."

Merge commit '5615074876e324863accc8d68ebe567c0041bda5' into eclair-mr2

* commit '5615074876e324863accc8d68ebe567c0041bda5':
  Revert "Use scan mode introduced in VCardParser."