Merge change 25829 into eclair

* changes:
  Revert "ContactsContract: Adding joined columns to the Data class definition."