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

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

Change-Id: Ib2359874d7922df45d38aa436466985aa2d04b25