am f6df5b41: (-s ours) am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider

* commit 'f6df5b41e145ee996ca4f94bec014ab3e41f0b21':
  DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
tree: 26b259e6c7be68626372782b48ac15a168ff75f6
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/