Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev