Revert "Revert "Allow MediaBrowser be connect to MediaBrowserServiceCompat""

- This reverts commit 493571364635be0190cea8ee230a601070391e6f.
- Also fix the build issue.

Change-Id: Ifc58b98cdc71aad59cfeaf4708cefd879bb0d1be
10 files changed