Use 5.0.x-style module paths in tests

Author: kevints

test/lit.cfg

@@ -1125,9 +1125,7 @@ if platform.system() != 'Darwin':
     config.target_resilience_test = ('%s --no-symbol-diff' %
                                      config.target_resilience_test)
 
-platform_module_dir = make_path(test_resource_dir, config.target_sdk_name)
-if run_vendor != 'apple':
-    platform_module_dir = make_path(platform_module_dir, run_cpu)
+platform_module_dir = make_path(make_path(test_resource_dir, config.target_sdk_name), run_cpu)
 lit_config.note('Using platform module dir: ' + platform_module_dir)
 if test_sdk_overlay_dir:
     platform_sdk_overlay_dir = test_sdk_overlay_dir