Merge changes I28b846a3,Ifd9b48cb

* changes:
  MediaScanner: Fix problems with scanner non-file objects from the database
  MTP: Delete all files and subdirectories when deleting directories.
tree: fe010eb3b36e14337324f104c0f188925dd6937b
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/