am 5c80b1d2: am 9a72b890: hardcode the google sync gservices settings for now

Merge commit '5c80b1d2534c95a217e60ddd8dcf35352c75e431'

* commit '5c80b1d2534c95a217e60ddd8dcf35352c75e431':
  hardcode the google sync gservices settings for now