Merge changes 23429,23430 into eclair

* changes:
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.