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

* commit '5f4e7a104b764f07bdc963aa7e668cc3913f85e3':
  Support7Demos: media router sample