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

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

Change-Id: I4707904af871eb2fb710bc7d10b5aced93a6e8eb