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

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