diff --git a/BUILD.gn b/BUILD.gn
index 779551b..ed87dfd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,7 +12,18 @@
     "android-emu/android/base/files/Stream.h",
     "android-emu/android/base/files/StreamSerializing.cpp",
     "android-emu/android/base/files/StreamSerializing.h",
+    "android-emu/android/base/synchronization/AndroidConditionVariable.h",
+    "android-emu/android/base/synchronization/AndroidLock.h",
+    "android-emu/android/base/synchronization/AndroidMessageChannel.h",
+    "android-emu/android/base/synchronization/AndroidMessageChannel.cpp",
+    "android-emu/android/base/threads/AndroidFunctorThread.h",
+    "android-emu/android/base/threads/AndroidThread.h",
+    "android-emu/android/base/threads/AndroidThreadStore.h",
+    "android-emu/android/base/threads/AndroidThreadTypes.h",
     "android-emu/android/base/threads/AndroidWorkPool.h",
+    "android-emu/android/base/threads/AndroidFunctorThread.cpp",
+    "android-emu/android/base/threads/AndroidThreadStore.h",
+    "android-emu/android/base/threads/AndroidThread_pthread.cpp",
     "android-emu/android/base/threads/AndroidWorkPool.cpp",
     "android-emu/android/base/Tracing.cpp",
     "android-emu/android/base/Tracing.h",
@@ -99,7 +110,7 @@
 
     include_dirs += [
       "fuchsia/include",
-      "//third_party/vulkan_loader_and_validation_layers/include"
+      "//third_party/Vulkan-Headers/include"
     ]
 
     libs = [
diff --git a/system/vulkan_enc/vk_format_info.h b/system/vulkan_enc/vk_format_info.h
index 111a024..8c0b7dc 100644
--- a/system/vulkan_enc/vk_format_info.h
+++ b/system/vulkan_enc/vk_format_info.h
@@ -51,11 +51,13 @@
       return VK_FORMAT_A2B10G10R10_UNORM_PACK32;
    case HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL:
       return VK_FORMAT_G8_B8R8_2PLANE_420_UNORM;
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
    case HAL_PIXEL_FORMAT_YV12:
       // YUV converter will convert this format to R8G8B8A8
       // TODO: should we use R8G8B8A8 for other YUV format as well?
       return VK_FORMAT_R8G8B8A8_UNORM;
    case AHARDWAREBUFFER_FORMAT_BLOB:
+#endif
    default:
       return VK_FORMAT_UNDEFINED;
    }