Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev