Fix gyp/gcc build.

src/common/aligned_memory_unittest.cpp

@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
 
 #define EXPECT_ALIGNED(ptr, align) EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1))
 
@@ -42,4 +42,4 @@ TEST(AlignedMemoryTest, DynamicAllocation)
     AlignedFree(p);
 }
 
-}  // namespace base
+}  // namespace base
\ No newline at end of file

src/libANGLE/renderer/vulkan/SurfaceVk.cpp

@@ -233,6 +233,7 @@ vk::Error WindowSurfaceVk::initializeImpl(RendererVk *renderer)
 
     uint32_t presentQueue = 0;
     ANGLE_TRY_RESULT(renderer->selectPresentQueueForSurface(mSurface), presentQueue);
+    (void) presentQueue;
 
     const VkPhysicalDevice &physicalDevice = renderer->getPhysicalDevice();