Update to use aosp vcard

Change-Id: I40be3c1a08c7e20406c7fb2000577adc325b0b47