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

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

Change-Id: Ic368e74caf70fbd5b0a0185ee119032b646a8c91