Fix Android builds compiler flags am: e2af5c745d am: 7755688536
Fix Android builds compiler flags am: e2af5c745d
am: 7755688536

Change-Id: Ie79d59b5366eec9681e852e6e4f9cd69eddbaba0

KhronosGroup/VK-GL-CTS,googlestadia/VK-GL-CTS,googlestadia/VK-GL-CTS,KhronosGroup/VK-GL-CTS,KhronosGroup/Vulkan-CTS,googlestadia/VK-GL-CTS,KhronosGroup/VK-GL-CTS,chadversary/deqp,KhronosGroup/Vulkan-CTS,KhronosGroup/VK-GL-CTS,KhronosGroup/Vulkan-CTS,googlestadia/VK-GL-CTS,KhronosGroup/VK-GL-CTS,KhronosGroup/VK-GL-CTS,googlestadia/VK-GL-CTS,KhronosGroup/Vulkan-CTS,KhronosGroup/Vulkan-CTS,KhronosGroup/Vulkan-CTS,googlestadia/VK-GL-CTS,chadversary/deqp,chadversary/deqp,chadversary/deqp,chadversary/deqp,chadversary/deqp