Merge "Update media router's build file to the new system" into nyc-dev