Merge change I50a321c9 into eclair

* changes:
  LocationManagerService: Fix race when removing LocationListener