Merge "Remove incomplete media router API." into mnc-dev