am cdc171cd: Merge "Update the MediaRouter support demo for new UIs" into lmp-mr1-dev

* commit 'cdc171cd042d9ed86b4a8f5d12e561e62cd66106':
  Update the MediaRouter support demo for new UIs