Clean up multi picker activity.

Conflicts:
	src/com/android/contacts/activities/MultiPickContactActivity.java

Change-Id: Id8d66cf3ff5f806a053f40bd4d8db453ab292219