Merge "DO NOT MERGE) Revert "Fix support_library build due to MediaRouter"" into mnc-ub-dev