MediaBrowserCompat: Refactor class hierarchies

Change-Id: If2a26274d0246f02766a1fb388c9d9079cf9358b
8 files changed