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

* commit '7bfb532155c207c7dd69e5b8c480c05491f9205a':
  MediaRouter: Reduce the size of the mediarouter library

Change-Id: I9f16418dd0e92b509eea6d731b2e25a639c87390