Merge "Make RouteSessionController as inner class of MediaRouter2"