Merge "Land MediaBrowserCompat sample in Support4Demos" into nyc-dev