am f017167f: Merge change 25794 into eclair

Merge commit 'f017167f52e2459cf16fabde8afb5a6c51bd780f' into eclair-plus-aosp

* commit 'f017167f52e2459cf16fabde8afb5a6c51bd780f':
  Remove the GDD Gservices setting.