Merge "Fix regression in directory scanning"
tree: fe03918cd609db3d998fb94bc9ffcc800182dc0f
  1. camera/
  2. cmds/
  3. include/
  4. media/