am d3e4290c: DO NOT MERGE MTP and media provider support for multiple storage devices:

* commit 'd3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa':
  DO NOT MERGE MTP and media provider support for multiple storage devices:
tree: 7efd8a683e20aada458d42e5771b93ae72769ad7
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/