Merge "Remove ContactsTest GMS Dependencies" into froyo