Merge "MediaRouter: Reduce the size of the mediarouter library" into nyc-dev am: e118705e61 am: 7bfb532155
am: a79cb5865f

* commit 'a79cb5865f8629eb147cbd2deabb8372c6a168fa':
  MediaRouter: Reduce the size of the mediarouter library

Change-Id: I8d99eb19e38d3cd075d60d26f6916ca90e575180