Merge "Extracting MediaCompat classes into a new module"