am b9c40a65: Merge change I5d30aa18 into eclair

Merge commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c' into eclair-plus-aosp

* commit 'b9c40a65c7fb2121d3076a522248574162bf5f8c':
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.