Merge "MediaRouter: Clean up obsolete code." into mnc-ub-dev