Merge "MediaScanner: Move genre table management to MediaProvider"