Merge "Remove separate_platform_variant entries."