am 9d80f708: am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev

* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
  Revert "Remove mediarouter v7 support library from SDK."