Merge change 23402 into eclair

* changes:
  Fix 2081525: NPE in MediaScannerService.