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

* commit '8b51a39fda458039e68b650eb46f90b95f4bddca':
  Revert "Remove mediarouter v7 support library from SDK."