Contacts 4.3 goes TRDS 2.0

Conflicts:
	res/values/styles.xml

Change-Id: Ia3e9b6a532c542fa747419a6ef29a40f8fa9df04