Renamed osx_gl to mac and es3 to android for cache folders (#949)

scripts/build/Platform/Android/build_config.json

@@ -99,7 +99,7 @@
         "CMAKE_NATIVE_BUILD_ARGS": "/m /nologo",
         "ASSET_PROCESSOR_BINARY": "bin\\profile\\AssetProcessorBatch.exe",
         "ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode --regset=\"/Amazon/AssetProcessor/Settings/Exclude Android/pattern=.*/DiffuseGlobalIllumination/.*precompiledshader\"",
-        "ASSET_PROCESSOR_PLATFORMS":"es3"
+        "ASSET_PROCESSOR_PLATFORMS":"android"
     }
   },
   "release": {

scripts/build/Platform/Mac/build_config.json

@@ -86,7 +86,7 @@
       "CMAKE_TARGET": "AssetProcessorBatch",
       "ASSET_PROCESSOR_BINARY": "bin/profile/AssetProcessorBatch",
       "ASSET_PROCESSOR_OPTIONS": "/zeroAnalysisMode",
-      "ASSET_PROCESSOR_PLATFORMS": "osx_gl"
+      "ASSET_PROCESSOR_PLATFORMS": "mac"
     }
   },
   "periodic_test_profile": {

scripts/bundler/gen_shaders.py

@@ -163,11 +163,11 @@ def add_shaders_types():
     shaders.append(gl4)
 
     gles3 = _ShaderType('GLES3', 'GLSL_HLSLcc')
-    gles3.add_configuration('Android', 'es3')
+    gles3.add_configuration('Android', 'android')
     shaders.append(gles3)
 
     metal = _ShaderType('METAL', 'METAL_LLVM_DXC')
-    metal.add_configuration('Mac', 'osx_gl')
+    metal.add_configuration('Mac', 'mac')
     metal.add_configuration('iOS', 'ios')
     shaders.append(metal)