Merge "Revert "MediaBrowserCompat: Refactor class hierarchies"" into mnc-ub-dev