Avoid to write alias in the vCard
Make PHOTO detection more generic

Change-Id: Ie44630cbcee240befe70cdfbc8d68efc8c507877