am 052b1d4a: Merge "Support7Demos: Update the MediaRouter demo" into mnc-ub-dev

* commit '052b1d4aeb2221a4efc0d260c7d5054d8141957b':
  Support7Demos: Update the MediaRouter demo