am 874c508c: am bfb9fb14: Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.

Merge commit '874c508c5352936c0640317ef44b81c9b632dfd6'

* commit '874c508c5352936c0640317ef44b81c9b632dfd6':
  Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.