Merge change I705b1d33 into eclair

* changes:
  GpsLocationProvider: Do not release wakelock until the GPS engine is fully off