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