am 5dc16a77: am 8dfb3331: remove the old ContactsSyncAdapter and GoogleContactsProvider

Merge commit '5dc16a7788363d7108e74d251c83004e1e1a4a47'

* commit '5dc16a7788363d7108e74d251c83004e1e1a4a47':
  remove the old ContactsSyncAdapter and GoogleContactsProvider