Merge "Update media router\'s build file to the new system" into nyc-dev
am: 9cf2787d24

* commit '9cf2787d244990caab0a070df01932ba1d32836d':
  Update media router's build file to the new system

Change-Id: Ie92d904e3e365ded5e176d7377783a1dafbb003e