Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp * commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a': Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.