diff --git a/Native/ManagedToNative.cpp b/Native/ManagedToNative.cpp
index 92a03c9c..95035405 100644
--- a/Native/ManagedToNative.cpp
+++ b/Native/ManagedToNative.cpp
@@ -216,6 +216,18 @@ extern "C"
 
 	//----------------------------------------------------------------------------
 
+	MANAGED_TO_POPCORN_CONVENTION int	GetStackLogNumber()
+	{
+		if (!CRuntimeManager::IsInstanceInitialized())
+			return 0;
+
+		CUnityLog	*logger = CRuntimeManager::Instance().GetLogger();
+
+		return (int)logger->Count();
+	}
+
+	//----------------------------------------------------------------------------
+
 	MANAGED_TO_POPCORN_CONVENTION int	UnstackLog(char *dstBuffer, int dstSize, int &logSeverity)
 	{
 		// DO NOT LOG ANYTHING IN THIS FUNCTION! INFINITE LOOP...
diff --git a/Native/ManagedToNative.h b/Native/ManagedToNative.h
index 46e8b69c..7d18c591 100644
--- a/Native/ManagedToNative.h
+++ b/Native/ManagedToNative.h
@@ -323,6 +323,7 @@ extern "C"
 	MANAGED_TO_POPCORN_CONVENTION void 								PopcornFXShutdown();
 	//Log
 	MANAGED_TO_POPCORN_CONVENTION void								SetMaxLogStack(int maxLogStack);
+	MANAGED_TO_POPCORN_CONVENTION int								GetStackLogNumber();
 	MANAGED_TO_POPCORN_CONVENTION int								UnstackLog(char *dstBuffer, int dstSize, int &logSeverity);
 	// Update and rendering:
 	MANAGED_TO_POPCORN_CONVENTION void								SetMaxCameraCount(int number);
@@ -395,6 +396,7 @@ extern "C"
 	MANAGED_TO_POPCORN_CONVENTION const char						*GetRuntimeVersion();
 
 	MANAGED_TO_POPCORN_CONVENTION void								SetApplicationLoopbackAudioVolume(float volume);
+	MANAGED_TO_POPCORN_CONVENTION bool								CanSkipUpdate();
 
 	MANAGED_TO_POPCORN_CONVENTION void								SetQualityLevelSettings(const char **qualityLevelNames, int qualityLevelCount, int current, bool updateCookery);
 
diff --git a/Native/PKUnity_Log.h b/Native/PKUnity_Log.h
index 5b3cb163..8f55437f 100644
--- a/Native/PKUnity_Log.h
+++ b/Native/PKUnity_Log.h
@@ -26,6 +26,7 @@ class	CUnityLog : public ILogListener
 	s32				PopFront(SPopcornLogData &out);
 	void			SetMaxLogsCount(u32 maxLogsCount);
 	void			ClearLogs();
+	u32				Count() const { return m_LogStackMain.Count(); }
 
 	void			StartLogs();
 	void			ValidateLogsAtLevel(CLog::ELogLevel level, const CString &header);
diff --git a/Native/PKUnity_Scene.cpp b/Native/PKUnity_Scene.cpp
index 5b6f02a5..f12f1c2c 100644
--- a/Native/PKUnity_Scene.cpp
+++ b/Native/PKUnity_Scene.cpp
@@ -185,6 +185,29 @@ void	CPKFXScene::SyncPreviousUpdateAndRunDeferredCallsIFN()
 
 //----------------------------------------------------------------------------
 
+bool	CPKFXScene::ShouldUpdatePopcorn()
+{
+	if (!m_WaitForUpdateOnRenderThread)
+	{
+		PK_ASSERT(m_ParticleMediumCollection != null);
+		if (m_ParticleMediumCollection->CanSkipUpdate())
+			return false;
+	}
+	else
+	{
+		PK_ASSERT(m_ParticleMeshMediumCollection != null);
+		PK_ASSERT(m_ParticleMediumCollection != null);
+
+		if (m_ParticleMediumCollection->CanSkipUpdate() &&
+			m_ParticleMeshMediumCollection->CanSkipUpdate())
+			return false;
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+
 void	CPKFXScene::LaunchUpdate(float dt)
 {
 	PK_SCOPEDPROFILE();
@@ -204,7 +227,7 @@ void	CPKFXScene::LaunchUpdate(float dt)
 
 	if (UpdateMode() != UpdateMode_NoUpdate)
 	{
-		if (dt != 0.0f)
+		if (dt != 0.0f && ShouldUpdatePopcorn())
 		{
 			CRuntimeManager::Instance().BeforeUpdate();
 			CRuntimeManager::Instance().Update(dt);
@@ -217,6 +240,7 @@ void	CPKFXScene::LaunchUpdate(float dt)
 				PopcornFX::CTimer	updateTimer;
 				updateTimer.Start();
 #endif // (PK_PARTICLES_HAS_STATS != 0)
+
 				m_ParticleMediumCollection->Update(dt);
 
 				while (m_ParticleMediumCollection->UpdateFence(1)) { }
diff --git a/Native/PKUnity_Scene.h b/Native/PKUnity_Scene.h
index a4e75c27..fc45c19c 100644
--- a/Native/PKUnity_Scene.h
+++ b/Native/PKUnity_Scene.h
@@ -114,6 +114,7 @@ class	CPKFXScene : public CRefCountedObject, public IParticleScene
 	void						TransformAllParticles(const CFloat3 &worldOffset);
 
 	void						ResolveDynamicCollisionsIFN();
+	bool						ShouldUpdatePopcorn();
 
 	// Both of those need to be called for the particles to be correctly updated:
 	void						SyncPreviousUpdateAndRunDeferredCallsIFN();
diff --git a/Native/RenderingIntegration/UnityRendererCache.cpp b/Native/RenderingIntegration/UnityRendererCache.cpp
index 61f81b99..1867265b 100644
--- a/Native/RenderingIntegration/UnityRendererCache.cpp
+++ b/Native/RenderingIntegration/UnityRendererCache.cpp
@@ -464,6 +464,7 @@ bool	CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render
 	const SRendererFeaturePropertyValue *atlasBlending = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_Atlas_Blending());
 
 	m_Flags.m_ShaderVariationFlags = 0;
+
 	if (diffuse != null && diffuse->ValueB() && diffuseMap != null && !diffuseMap->ValuePath().Empty())
 		m_Flags.m_ShaderVariationFlags |= ShaderVariationFlags::Has_DiffuseMap;
 	if (alphaRemap != null && alphaRemap->ValueB() && alphaRemapAlphaMap != null && !alphaRemapAlphaMap->ValuePath().Empty() && alphaRemapCursor.Valid())
@@ -524,7 +525,10 @@ bool	CParticleMaterialDescMesh::InitFromRenderer(const CRendererDataMesh &render
 	m_Flags.m_BlendMode = BlendMode::Solid;
 
 	if (transparent != null && transparent->ValueB() && transparentType != null)
-	{
+	{		
+		const SRendererFeaturePropertyValue *globalSortOverride = renderer.m_Declaration.FindProperty(BasicRendererProperties::SID_Transparent_GlobalSortOverride());
+		m_Flags.m_DrawOrder = globalSortOverride != null ? globalSortOverride->ValueI().x() : 0;
+	
 		if (transparentType->ValueI().x() == BasicRendererProperties::Additive)
 		{
 			m_Flags.m_BlendMode = BlendMode::Additive;
@@ -923,6 +927,7 @@ bool	CUnityRendererCache::GetRendererInfo(SMeshRendererDesc &desc)
 	desc.m_InvSoftnessDistance = m_MaterialDescMesh.m_InvSoftnessDistance;
 	desc.m_AlphaClipThreshold = m_MaterialDescMesh.m_AlphaThreshold;
 	desc.m_DoubleSided = m_MaterialDescMesh.m_DoubleSided;
+	desc.m_DrawOrder = m_MaterialDescMesh.m_Flags.m_DrawOrder;
 
 	bool fluidVAT = (m_MaterialDescMesh.m_Flags.m_ShaderVariationFlags & ShaderVariationFlags::Has_FluidVAT) != 0;
 	bool softVAT = (m_MaterialDescMesh.m_Flags.m_ShaderVariationFlags & ShaderVariationFlags::Has_SoftVAT) != 0;
diff --git a/Native/RuntimeManager.cpp b/Native/RuntimeManager.cpp
index b46baa5e..716d747f 100644
--- a/Native/RuntimeManager.cpp
+++ b/Native/RuntimeManager.cpp
@@ -1668,6 +1668,13 @@ void	CRuntimeManager::AfterUpdate()
 
 //----------------------------------------------------------------------------
 
+bool	CRuntimeManager::CanSkipUpdate()
+{
+	return !m_ParticleScene->ShouldUpdatePopcorn();
+}
+
+//----------------------------------------------------------------------------
+
 bool	CRuntimeManager::KickBackgroundTasksIFN()
 {
 	if (m_HasBackgroundTasksToKick)
diff --git a/Native/RuntimeManager.h b/Native/RuntimeManager.h
index 2d6aafe6..c32f4dd8 100644
--- a/Native/RuntimeManager.h
+++ b/Native/RuntimeManager.h
@@ -197,6 +197,7 @@ class	CRuntimeManager : public CNonCopyable
 
 	void								BeforeUpdate();
 	void								AfterUpdate();
+	bool								CanSkipUpdate();
 
 	template<class T>
 	bool								AddBackgroundTask(T *functor)
diff --git a/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs b/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs
index f2dfe4cf..d0574739 100644
--- a/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs
+++ b/com.persistant-studios.popcornfx.urp/Runtime/Scripts/PKFxMaterialFactoryURP.cs
@@ -211,8 +211,7 @@ public override Material ResolveParticleMaterial(SBatchDesc batchDesc, PKFxEffec
 				Debug.LogError("[PopcornFX] Trying to resolve material from PKFxEffectAsset that is not holding materials");
 			if (material == null)
 				return null;
-			if (batchDesc.m_Type != ERendererType.Mesh)
-				material.renderQueue = m_RenderQueue + batchDesc.m_DrawOrder;
+			material.renderQueue = m_RenderQueue + batchDesc.m_DrawOrder;
 			return material;
 		}
 	}
diff --git a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs
index 65007428..5e0217cd 100644
--- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs
+++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxAssetEditor.cs
@@ -166,9 +166,8 @@ public override void OnInspectorGUI()
 			SerializedProperty rdrs = serializedObject.FindProperty("m_RendererDescs");
 			SerializedProperty mats = serializedObject.FindProperty("m_Materials");
 			SerializedProperty customMats = serializedObject.FindProperty("m_CustomMaterials");
+
 			int rdrsListSize = rdrs.arraySize;
-			if (rdrsListSize > 0)
-				EditorGUILayout.LabelField("Renderers : ");
 
 			// Upgrade if material wasn't set in import (2.12.7 ++)
 			if (mats.arraySize < rdrsListSize)
diff --git a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
index ee0cb399..794f92b5 100644
--- a/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
+++ b/com.persistant-studios.popcornfx/Editor/Scripts/PKFxMenus.cs
@@ -506,7 +506,7 @@ static void UpdatePKFxFXReferencesInScene()
 
 		//----------------------------------------------------------------------------
 
-		public static void CreatePKFxFXMaterialsIFN()
+		public static void CreatePKFxFXMaterialsIFN(bool reimport = false)
 		{
 			string[] pkfxEffectAssets = AssetDatabase.FindAssets("t:PKFxEffectAsset");
 
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs
index a7814038..2c61e901 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxCamera.cs
@@ -57,9 +57,8 @@ public int RenderPass
 
 		bool SetupDistortionPassIFN()
 		{
-			if (GraphicsSettings.renderPipelineAsset != null &&
-				(GraphicsSettings.renderPipelineAsset.name == "HDRenderPipelineAsset" ||
-				 GraphicsSettings.renderPipelineAsset.name == "UniversalRenderPipelineAsset"))
+			if (PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.URP ||
+				PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.HDRP)
 				return false; // HDRP, we are using distortion builtin shaders
 							  // URP, Distortion is handled as forward rendering
 			if (PKFxSettings.EnableSoftParticles == false)
@@ -193,13 +192,11 @@ internal void SetCullingMask(short ID, LayerMask targetMask, LayerMask allPKMask
 
 			if (PKFxSettings.EnableDistortion)
 			{
-				if (GraphicsSettings.renderPipelineAsset == null ||
-					!(GraphicsSettings.renderPipelineAsset.name == "HDRenderPipelineAsset" ||
-					  GraphicsSettings.renderPipelineAsset.name == "UniversalRenderPipelineAsset"))
+				if (PKFxSettings.MaterialFactory.m_FactoryType != PKFxMaterialFactory.FactoryType.URP &&
+					PKFxSettings.MaterialFactory.m_FactoryType != PKFxMaterialFactory.FactoryType.HDRP)
 				{
 					// We disable the rendering of the distortion objects, this is going to be handled in a command buffer:
 					m_Camera.cullingMask &= ~(1 << LayerMask.NameToLayer(PKFxManagerImpl.m_DistortionLayer));
-
 				}
 				else
 					m_Camera.cullingMask |= 1 << LayerMask.NameToLayer(PKFxManagerImpl.m_DistortionLayer);
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs
index eb22e346..433f373c 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxLogger.cs
@@ -24,7 +24,7 @@ public static void	LogUpdate(PKFxManager.EPopcornLogLevels minimumLogLevel)
 			if (minimumLogLevel == PKFxManager.EPopcornLogLevels.Level_None)
 				return;
 
-			while (PKFxManager.GetPopcornFXLog(ref currentLog, ref level) >= 0)
+			while (PKFxManager.GetPopcornFXLogNumber() > 0 && PKFxManager.GetPopcornFXLog(ref currentLog, ref level) >= 0)
 			{
 				if ((int)level < (int)minimumLogLevel)
 					continue;
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs
index 3a77f1c1..c1c74e5b 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Components/PKFxRenderingPlugin.cs
@@ -175,6 +175,8 @@ public void UpdateSimulation()
 
 		void Update()
 		{
+			if (PKFxManager.CanSkipUpdate())
+				return;
 			for (int i = 0; i < m_Cameras.Count; ++i)
 			{
 				if (i < MaxCameraSupport())
@@ -197,8 +199,9 @@ private void LateUpdate()
 
 		void _LateUpdate()
 		{
+			if (PKFxManager.CanSkipUpdate())
+				return;
 			PKFxManager.UpdateParticles();
-
 			for (int i = 0; i < m_Cameras.Count; ++i)
 			{
 				if (i < MaxCameraSupport())
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
index d46cc1a2..ee306687 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/Internal/PKFxManagedToNative.cs
@@ -210,6 +210,8 @@ internal partial class PKFxManagerImpl : object
 		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
 		public static extern int UnstackLog(StringBuilder dstBuffer, int dstSize, ref int logSeverity);
 		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
+		public static extern int GetStackLogNumber();
+		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
 		public static extern void SetMaxCameraCount(int number);
 		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
 		public static extern void SetCurrentQualityLevel(string currentQualityLevel);
@@ -326,6 +328,9 @@ internal partial class PKFxManagerImpl : object
 		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
 		public static extern void SetQualityLevelSettings(string[] QualityLevels, int qualityLevelCount, int currentQualityLevel, bool updateCookery);
 
+		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
+		public static extern bool CanSkipUpdate();
+
 #if UNITY_EDITOR
 		[DllImport(kPopcornPluginName, CallingConvention = kCallingConvention)]
 		public static extern bool PopcornFXEditorStartup();
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs
index 200ddcdb..b171c9b1 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxAssets/PKFxShaderInputBindings.cs
@@ -105,16 +105,21 @@ public void BindMaterialProperties(SBatchDesc batchDesc, Material material, PKFx
 			int dstMode = 0;
 			UnityBlendMode blend = UnityBlendMode.Alpha;
 			// Additive and distortion
-			if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_DistortionMap) ||
-				batchDesc.m_BlendMode == EBlendMode.Additive)
+			if (batchDesc.HasShaderVariationFlag(EShaderVariationFlags.Has_DistortionMap))
 			{
 				blend = UnityBlendMode.Additive;
 				srcMode = (int)UnityEngine.Rendering.BlendMode.SrcAlpha;
-				if (GraphicsSettings.renderPipelineAsset != null && GraphicsSettings.renderPipelineAsset.name == "UniversalRenderPipelineAsset")
+				if (PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.URP)
 					dstMode = (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha;
 				else
 					dstMode = (int)UnityEngine.Rendering.BlendMode.One;
 			}
+			else if (batchDesc.m_BlendMode == EBlendMode.Additive)
+			{
+				blend = UnityBlendMode.Additive;
+				srcMode = (int)UnityEngine.Rendering.BlendMode.SrcAlpha;
+				dstMode = (int)UnityEngine.Rendering.BlendMode.One;
+			}
 			else if (batchDesc.m_BlendMode == EBlendMode.AdditiveNoAlpha)
 			{
 				blend = UnityBlendMode.Additive;
@@ -140,6 +145,10 @@ public void BindMaterialProperties(SBatchDesc batchDesc, Material material, PKFx
 				dstMode = (int)UnityEngine.Rendering.BlendMode.One;
 			}
 
+			if (batchDesc.m_DrawOrder != 0 && PKFxSettings.MaterialFactory.m_FactoryType == PKFxMaterialFactory.FactoryType.URP)
+			{
+				material.SetFloat("_QueueOffset", batchDesc.m_DrawOrder);
+			}
 			if (!string.IsNullOrEmpty(m_SourceBlendPropertyName))
 			{
 				material.SetInt(m_SourceBlendPropertyName, srcMode);
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs
index bfde64f5..deab5aa6 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxManager.cs
@@ -96,6 +96,14 @@ public static void SetMaxLogsPerFrame(int maxLogs)
 			PKFxManagerImpl.SetMaxLogStack(maxLogs);
 		}
 
+		public static int GetPopcornFXLogNumber()
+		{
+			if (!PKFxManagerImpl._IsDllLoaded())
+				return 0;
+
+			return PKFxManagerImpl.GetStackLogNumber();
+		}
+
 		public static int GetPopcornFXLog(ref string log, ref EPopcornLogLevels level)
 		{
 			if (!PKFxManagerImpl._IsDllLoaded())
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
index c3c12e7d..b85af970 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxMaterialFactory.cs
@@ -101,12 +101,12 @@ public static string GetSelectedPathOrFallback()
 			return path;
 		}
 
-		public virtual Material EditorGetDefaultMaterial(SBatchDesc batchDesc, PKFxEffectAsset asset = null, bool logError = true)
+		public string EditorResolveMaterialName(SBatchDesc batchDesc)
 		{
 			if (batchDesc.m_Type == ERendererType.Light || batchDesc.m_Type == ERendererType.Sound)
 				return null;
 			PKFxRenderFeatureBinding binding = ResolveBatchBinding(batchDesc);
-			Material material;
+			Material material = null;
 
 			if (binding == null)
 			{
@@ -114,17 +114,15 @@ public virtual Material EditorGetDefaultMaterial(SBatchDesc batchDesc, PKFxEffec
 				return null;
 			}
 
-			string matName;
-			if (PKFxSettings.UseHashesAsMaterialName)
+			string matName = EditorResolveMaterialName(batchDesc);
+			string materialPath = "Assets/" + PKFxSettings.UnityPackFxPath + "/UnityMaterials/" + matName + ".mat";
+			Material assetMat = (Material)AssetDatabase.LoadAssetAtPath(materialPath, typeof(Material));
+
+			if (reimport && assetMat != null)
 			{
-				Hash128 hash = new Hash128();
-				hash.Append(batchDesc.m_GeneratedName);
-				matName = hash.ToString();
+				assetMat = null;
+				AssetDatabase.DeleteAsset(materialPath);
 			}
-			else
-				matName = batchDesc.GenerateShortNameFromDescription();
-
-			Material assetMat = (Material)AssetDatabase.LoadAssetAtPath("Assets/" + PKFxSettings.UnityPackFxPath + "/UnityMaterials/" + matName + ".mat", typeof(Material));
 			if (assetMat == null)
 			{
 				material = new Material(binding.m_Shader);
@@ -143,16 +141,6 @@ public virtual Material EditorGetDefaultMaterial(SBatchDesc batchDesc, PKFxEffec
 			AssetDatabase.SaveAssets();
 			return material;
 		}
-
-		public virtual Material EditorResolveMaterial(SBatchDesc batchDesc, PKFxEffectAsset asset = null, bool logError = true)
-		{
-			if (!AssetDatabase.IsValidFolder("Assets" + PKFxSettings.UnityPackFxPath))
-				AssetDatabase.CreateFolder("Assets", PKFxSettings.UnityPackFxPath.Substring(1));
-			if (!AssetDatabase.IsValidFolder("Assets" + PKFxSettings.UnityPackFxPath + "/UnityMaterials"))
-				AssetDatabase.CreateFolder("Assets" + PKFxSettings.UnityPackFxPath, "UnityMaterials");
-			
-			return EditorGetDefaultMaterial(batchDesc, asset, logError);
-		}
 #endif
 		
 		public PKFxRenderFeatureBinding ResolveBatchBinding(SBatchDesc batchDesc)
diff --git a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs
index ef986dbc..a20165e9 100644
--- a/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs
+++ b/com.persistant-studios.popcornfx/Runtime/Scripts/PKFxMaterialFactory/PKFxRendererDescription.cs
@@ -447,6 +447,7 @@ public SBatchDesc(SMeshRendererDesc desc)
 			m_Type = ERendererType.Mesh;
 			m_ShaderVariationFlags = desc.m_ShaderVariationFlags;
 			m_BlendMode = desc.m_BlendMode;
+			m_DrawOrder = desc.m_DrawOrder;
 			m_RotateUVs = false;
 			m_DiffuseMap = diffuseStr;
 			m_DiffuseRampMap = diffuseRampStr;
@@ -506,6 +507,7 @@ public SBatchDesc(SMeshRendererDesc desc)
 					for (int i = 0; i < desc.m_TextureAtlasCount; ++i)
 					{
 						Vector4 curCol = subRects[i];
+						curCol.w = 1 - curCol.y - curCol.w; // Unity sampling is reversed in Y. 
 						m_AtlasSubRects.SetPixel(i, 0, curCol);
 					}
 				}
@@ -628,6 +630,7 @@ public string GenerateNameFromDescription()
 				finalName += " ";
 				finalName += m_DoubleSided ? "DoubleSided" : "OneSided";
 			}
+			finalName += " " + m_DrawOrder;
 			return finalName;
 		}
 		public static string BlendModeToShortString(EBlendMode blendMode)
@@ -692,7 +695,6 @@ public static string MaterialFlagsToShortString(int materialFlags)
 
 		public string GenerateShortNameFromDescription()
 		{
-
 			string finalName;
 
 			if (m_Type == ERendererType.Billboard)
diff --git a/projects/UnityStore_android/PK-Discretizers.make b/projects/UnityStore_android/PK-Discretizers.make
index f1834567..12ea58ad 100644
--- a/projects/UnityStore_android/PK-Discretizers.make
+++ b/projects/UnityStore_android/PK-Discretizers.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Discretizers_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Discretizers_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Discretizers_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Discretizers_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Discretizers_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Discretizers_s.a
diff --git a/projects/UnityStore_android/PK-IntegrationUnity.make b/projects/UnityStore_android/PK-IntegrationUnity.make
index a5e17f38..6e30945a 100644
--- a/projects/UnityStore_android/PK-IntegrationUnity.make
+++ b/projects/UnityStore_android/PK-IntegrationUnity.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android
 TARGET = $(TARGETDIR)/libPK-UnityPlugin.so
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android64
 TARGET = $(TARGETDIR)/libPK-UnityPlugin.so
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android
 TARGET = $(TARGETDIR)/libPK-UnityPlugin.so
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../com.persistant-studios.popcornfx/Runtime/Plugins/Android64
 TARGET = $(TARGETDIR)/libPK-UnityPlugin.so
diff --git a/projects/UnityStore_android/PK-ParticlesToolbox.make b/projects/UnityStore_android/PK-ParticlesToolbox.make
index ab8600eb..42203ec4 100644
--- a/projects/UnityStore_android/PK-ParticlesToolbox.make
+++ b/projects/UnityStore_android/PK-ParticlesToolbox.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-ParticlesToolbox_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make b/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make
index 123b6963..ec1e4310 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_DDS.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_DDS_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make b/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make
index 0fb1f498..f9abfd59 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_EXR.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_EXR_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make b/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make
index 74b37717..f7b2f9ec 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_HDR.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_HDR_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make b/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make
index 49394915..6323f0cc 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_JPG.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_JPG_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make b/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make
index f056d168..e2a44187 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_PKM.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PKM_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make b/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make
index aa55a3eb..4f990464 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_PNG.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PNG_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make b/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make
index e21183a8..e3f63b59 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_PVR.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_PVR_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make b/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make
index 4d66ede1..c95821a7 100644
--- a/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make
+++ b/projects/UnityStore_android/PK-Plugin_CodecImage_TGA.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CodecImage_TGA_s.a
diff --git a/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make b/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make
index 57783e0b..23587233 100644
--- a/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make
+++ b/projects/UnityStore_android/PK-Plugin_CompilerBackend_CPU_VM.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Plugin_CompilerBackend_CPU_VM_s.a
diff --git a/projects/UnityStore_android/PK-RHI.make b/projects/UnityStore_android/PK-RHI.make
index eee26bbd..4177ef33 100644
--- a/projects/UnityStore_android/PK-RHI.make
+++ b/projects/UnityStore_android/PK-RHI.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-RHI_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-RHI_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-RHI_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-RHI_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-RHI_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-RHI_s.a
diff --git a/projects/UnityStore_android/PK-RenderHelpers.make b/projects/UnityStore_android/PK-RenderHelpers.make
index 8d338eaf..9f0713cc 100644
--- a/projects/UnityStore_android/PK-RenderHelpers.make
+++ b/projects/UnityStore_android/PK-RenderHelpers.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-RenderHelpers_s.a
diff --git a/projects/UnityStore_android/PK-Runtime.make b/projects/UnityStore_android/PK-Runtime.make
index d0554695..75dafedc 100644
--- a/projects/UnityStore_android/PK-Runtime.make
+++ b/projects/UnityStore_android/PK-Runtime.make
@@ -39,13 +39,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Runtime_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Runtime_d.a
@@ -77,13 +77,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Runtime_r.a
@@ -96,13 +96,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Runtime_r.a
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-Runtime_s.a
@@ -134,13 +134,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-Runtime_s.a
diff --git a/projects/UnityStore_android/PK-SampleLib.make b/projects/UnityStore_android/PK-SampleLib.make
index 324b9bfa..32ee7fd2 100644
--- a/projects/UnityStore_android/PK-SampleLib.make
+++ b/projects/UnityStore_android/PK-SampleLib.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-SampleLib_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-SampleLib_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-SampleLib_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-SampleLib_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-SampleLib_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-SampleLib_s.a
diff --git a/projects/UnityStore_android/PK-Sample_01_BasicStartup.make b/projects/UnityStore_android/PK-Sample_01_BasicStartup.make
index b20bbe42..3365249f 100644
--- a/projects/UnityStore_android/PK-Sample_01_BasicStartup.make
+++ b/projects/UnityStore_android/PK-Sample_01_BasicStartup.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_01_BasicStartup_s
diff --git a/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make b/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make
index 60125823..b10b813c 100644
--- a/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make
+++ b/projects/UnityStore_android/PK-Sample_02_BasicEvolve.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_BasicEvolve_s
diff --git a/projects/UnityStore_android/PK-Sample_02_FullIntegration.make b/projects/UnityStore_android/PK-Sample_02_FullIntegration.make
index 76c00804..27631b30 100644
--- a/projects/UnityStore_android/PK-Sample_02_FullIntegration.make
+++ b/projects/UnityStore_android/PK-Sample_02_FullIntegration.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_02_FullIntegration_s
diff --git a/projects/UnityStore_android/PK-Sample_03_EngineHooks.make b/projects/UnityStore_android/PK-Sample_03_EngineHooks.make
index 24e87b4f..5634659c 100644
--- a/projects/UnityStore_android/PK-Sample_03_EngineHooks.make
+++ b/projects/UnityStore_android/PK-Sample_03_EngineHooks.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_03_EngineHooks_s
diff --git a/projects/UnityStore_android/PK-Sample_04_EffectInterface.make b/projects/UnityStore_android/PK-Sample_04_EffectInterface.make
index 099bdb2f..9380b858 100644
--- a/projects/UnityStore_android/PK-Sample_04_EffectInterface.make
+++ b/projects/UnityStore_android/PK-Sample_04_EffectInterface.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_04_EffectInterface_s
diff --git a/projects/UnityStore_android/PK-Sample_05_Stats.make b/projects/UnityStore_android/PK-Sample_05_Stats.make
index 87ff916b..594c69a8 100644
--- a/projects/UnityStore_android/PK-Sample_05_Stats.make
+++ b/projects/UnityStore_android/PK-Sample_05_Stats.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_05_Stats_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_05_Stats_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_05_Stats_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_05_Stats_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_05_Stats_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_05_Stats_s
diff --git a/projects/UnityStore_android/PK-Sample_06_SimInterface.make b/projects/UnityStore_android/PK-Sample_06_SimInterface.make
index d9d0e312..dc52f6f4 100644
--- a/projects/UnityStore_android/PK-Sample_06_SimInterface.make
+++ b/projects/UnityStore_android/PK-Sample_06_SimInterface.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterface_s
diff --git a/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make b/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make
index 7583c08c..f90946da 100644
--- a/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make
+++ b/projects/UnityStore_android/PK-Sample_06_SimInterfaceGPU.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_06_SimInterfaceGPU_s
diff --git a/projects/UnityStore_android/PK-Sample_07_LOD.make b/projects/UnityStore_android/PK-Sample_07_LOD.make
index 1ac6b720..695dad9d 100644
--- a/projects/UnityStore_android/PK-Sample_07_LOD.make
+++ b/projects/UnityStore_android/PK-Sample_07_LOD.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_07_LOD_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_07_LOD_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_07_LOD_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_07_LOD_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_07_LOD_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_07_LOD_s
diff --git a/projects/UnityStore_android/PK-Sample_08_CustomCollision.make b/projects/UnityStore_android/PK-Sample_08_CustomCollision.make
index 944b87b5..5c121bd5 100644
--- a/projects/UnityStore_android/PK-Sample_08_CustomCollision.make
+++ b/projects/UnityStore_android/PK-Sample_08_CustomCollision.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_08_CustomCollision_s
diff --git a/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make b/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make
index 6e4e63ba..19388a0f 100644
--- a/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make
+++ b/projects/UnityStore_android/PK-Sample_09_AsyncLoading.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_09_AsyncLoading_s
diff --git a/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make b/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make
index 33aa15b0..54837e59 100644
--- a/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make
+++ b/projects/UnityStore_android/PK-Sample_10_AsyncRendering.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_10_AsyncRendering_s
diff --git a/projects/UnityStore_android/PK-Sample_11_ThreadPool.make b/projects/UnityStore_android/PK-Sample_11_ThreadPool.make
index a1e3a95d..9fffc4a6 100644
--- a/projects/UnityStore_android/PK-Sample_11_ThreadPool.make
+++ b/projects/UnityStore_android/PK-Sample_11_ThreadPool.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_11_ThreadPool_s
diff --git a/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make b/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make
index 5146c9fb..e36cf734 100644
--- a/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make
+++ b/projects/UnityStore_android/PK-Sample_12_GBufferSampling.make
@@ -35,13 +35,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_d
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_d
@@ -75,13 +75,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_r
@@ -95,13 +95,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_r
@@ -115,13 +115,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android_Samples
 TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_s
@@ -135,13 +135,13 @@ ALL_LDFLAGS += $(LDFLAGS) -L../../ExternalLibs/Runtime/bin/UnityStore/gmake_andr
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../../release/builds/Android64_Samples
 TARGET = $(TARGETDIR)/PK-Sample_12_GBufferSampling_s
diff --git a/projects/UnityStore_android/PK-UpgraderLib.make b/projects/UnityStore_android/PK-UpgraderLib.make
index 51c1c8b9..797e211b 100644
--- a/projects/UnityStore_android/PK-UpgraderLib.make
+++ b/projects/UnityStore_android/PK-UpgraderLib.make
@@ -40,13 +40,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-UpgraderLib_d.a
@@ -58,13 +58,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-UpgraderLib_d.a
@@ -76,13 +76,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-UpgraderLib_r.a
@@ -94,13 +94,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-UpgraderLib_r.a
@@ -112,13 +112,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-UpgraderLib_s.a
@@ -130,13 +130,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-UpgraderLib_s.a
diff --git a/projects/UnityStore_android/PK-ZLib.make b/projects/UnityStore_android/PK-ZLib.make
index 962dcfa4..740a2a1c 100644
--- a/projects/UnityStore_android/PK-ZLib.make
+++ b/projects/UnityStore_android/PK-ZLib.make
@@ -37,13 +37,13 @@ endef
 
 ifeq ($(config),debug_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-ZLib_d.a
@@ -55,13 +55,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),debug_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-ZLib_d.a
@@ -73,13 +73,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-ZLib_r.a
@@ -91,13 +91,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),release_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-ZLib_r.a
@@ -109,13 +109,13 @@ ALL_LDFLAGS += $(LDFLAGS)
 
 else ifeq ($(config),retail_android)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH)/arm-linux-androideabi-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH)/arm-linux-androideabi-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/armv7a-linux-androideabi21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH)/arm-linux-androideabi-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android
 TARGET = $(TARGETDIR)/libPK-ZLib_s.a
@@ -127,13 +127,13 @@ ALL_LDFLAGS += $(LDFLAGS) -s
 
 else ifeq ($(config),retail_android64)
 ifeq ($(origin CC), default)
-  CC = $(EASYPATH64)/aarch64-linux-android-clang
+  CC = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang
 endif
 ifeq ($(origin CXX), default)
-  CXX = $(EASYPATH64)/aarch64-linux-android-clang++
+  CXX = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/aarch64-linux-android21-clang++
 endif
 ifeq ($(origin AR), default)
-  AR = $(EASYPATH64)/aarch64-linux-android-ar
+  AR = $(PK_ANDROID_TOOLCHAINS)/toolchain-r21e/bin/llvm-ar
 endif
 TARGETDIR = ../../ExternalLibs/Runtime/bin/UnityStore/gmake_android64
 TARGET = $(TARGETDIR)/libPK-ZLib_s.a