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

* commit '24828ae84954578ddee0f5449f2f9f4bd5f10435':

Change-Id: Ia7bfc269658e3dff88340d4cb80227f3a66c3d31