Merge change I4414f233 into eclair-mr2

* changes:
  Remove references to com.google.android.gtalkservice.xml.