Merge "Revert "MediaRouter2: Create MediaRouter2A.java for rewriting MediaRouter2""