Snap for 4818534 from add785f6efc8483d02b8e96424f7ad0104767cb0 to pi-release

Change-Id: Ib680fdaf1aef075cf653f548d56bac4277e31094
diff --git a/external/vulkancts/framework/vulkan/vkDefs.hpp b/external/vulkancts/framework/vulkan/vkDefs.hpp
index dcdb5f8..0b041b8 100644
--- a/external/vulkancts/framework/vulkan/vkDefs.hpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.hpp
@@ -25,7 +25,7 @@
 
 #include "tcuDefs.hpp"
 
-#if (DE_OS == DE_OS_ANDROID) && defined(__ARM_ARCH_7A__)
+#if (DE_OS == DE_OS_ANDROID) && defined(__ARM_ARCH) && defined(__ARM_32BIT_STATE)
 #	define VKAPI_ATTR __attribute__((pcs("aapcs-vfp")))
 #else
 #	define VKAPI_ATTR