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

* commit '6002133545b0c33bcc4051074b34c90e8c555eb9':

Change-Id: I4b1c4797d8dde5cdea98d979462cbd15c218ae47