am 7e9ab48e: am 5f4e7a10: Merge "Support7Demos: media router sample" into jb-mr2-ub-dev

* commit '7e9ab48ed0e49eec0abdc58c96a6bc5fd2369919':
  Support7Demos: media router sample