Add Facebook contact sync support (2/2)

Change-Id: I3b2c91a49415095fb96f0d95d19e3aeb4ac12ce9

Conflicts:
	src/com/android/providers/contacts/ContactsDatabaseHelper.java