am f1cecce8: Merge change I4414f233 into eclair-mr2

Merge commit 'f1cecce82f98d96e564cc44dd01c50909f2d7818' into eclair-mr2-plus-aosp

* commit 'f1cecce82f98d96e564cc44dd01c50909f2d7818':
  Remove references to com.google.android.gtalkservice.xml.