Revert "MediaBrowserCompat: Refactor class hierarchies"

This reverts commit 9dce8fd27814d2ce8854f21a2725d5f614c5ccf9.

Change-Id: I95a89992d03d86ed69cfdeb72d5e2faca297123d
8 files changed