Merge "MediaRouter: Handle NoSuchMethodError at MediaRouterJellybeanMr1" into nyc-dev