Merge "MediaRouter: Reduce the size of the mediarouter library" into nyc-dev