Merge change 25874 into eclair

* changes:
  ContactsContract: Adding joined columns to the CommonDataKind class definitions.