diff --git a/shared/OpenglCodecCommon/ErrorLog.h b/shared/OpenglCodecCommon/ErrorLog.h
index d2388e65fdedbba50986329b46a555a8f9794b65..fa2b0a248d3a9efb00c25f9467c46d80c55cf70a 100644
--- a/shared/OpenglCodecCommon/ErrorLog.h
+++ b/shared/OpenglCodecCommon/ErrorLog.h
@@ -17,7 +17,11 @@
 #define _ERROR_LOG_H_
 
 #if defined(__ANDROID__)
-#    include <cutils/log.h>
+#    if PLATFORM_SDK_VERSION < 26
+#        include <cutils/log.h>
+#    else
+#        include <log/log.h>
+#    endif
 #    define ERR(...)    ALOGE(__VA_ARGS__)
 #    ifdef EMUGL_DEBUG
 #        define DBG(...)    ALOGD(__VA_ARGS__)
diff --git a/shared/OpenglCodecCommon/FixedBuffer.h b/shared/OpenglCodecCommon/FixedBuffer.h
index 9a908de126e33c37df29511538d16a3ad984ff2c..8c3474973b18d45de42ea9120533e50bb68b782a 100644
--- a/shared/OpenglCodecCommon/FixedBuffer.h
+++ b/shared/OpenglCodecCommon/FixedBuffer.h
@@ -16,7 +16,11 @@
 #ifndef _FIXED_BUFFER_H
 #define _FIXED_BUFFER_H
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 
 class FixedBuffer {
 public:
diff --git a/shared/OpenglCodecCommon/GLClientState.cpp b/shared/OpenglCodecCommon/GLClientState.cpp
index 4375ef0fcdfd81faf80e705905d07f43974e8dd8..d2075cf2d06aa321eb3a038c74c682d3df3d257b 100644
--- a/shared/OpenglCodecCommon/GLClientState.cpp
+++ b/shared/OpenglCodecCommon/GLClientState.cpp
@@ -20,7 +20,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include "glUtils.h"
+
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 
 #ifndef MAX
 #define MAX(a, b) ((a) < (b) ? (b) : (a))
diff --git a/shared/OpenglCodecCommon/GLESTextureUtils.cpp b/shared/OpenglCodecCommon/GLESTextureUtils.cpp
index 45729053406568e913a35f4acbbd2499fa49a147..297a862f8600c73de854f669c0d1039a92810cd7 100644
--- a/shared/OpenglCodecCommon/GLESTextureUtils.cpp
+++ b/shared/OpenglCodecCommon/GLESTextureUtils.cpp
@@ -2,7 +2,11 @@
 
 #include "glUtils.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 
 namespace GLESTextureUtils {
 
diff --git a/shared/OpenglCodecCommon/glUtils.h b/shared/OpenglCodecCommon/glUtils.h
index e1f4ff39d30c646cffcfb53c9cfd12ee558430b9..2f20b689221456ff77a56eb89519d833cef71f2a 100644
--- a/shared/OpenglCodecCommon/glUtils.h
+++ b/shared/OpenglCodecCommon/glUtils.h
@@ -16,7 +16,11 @@
 #ifndef __GL_UTILS_H__
 #define __GL_UTILS_H__
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/shared/OpenglCodecCommon/goldfish_address_space.cpp b/shared/OpenglCodecCommon/goldfish_address_space.cpp
index 46420bfd1033a45c97aeae3e3aae8d4e71149230..50ea76b45366e5809f5bc55511e44ec54948e999 100644
--- a/shared/OpenglCodecCommon/goldfish_address_space.cpp
+++ b/shared/OpenglCodecCommon/goldfish_address_space.cpp
@@ -1,4 +1,9 @@
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
+
 #include "goldfish_address_space.h"
 
 #ifdef HOST_BUILD
diff --git a/shared/OpenglCodecCommon/goldfish_dma.cpp b/shared/OpenglCodecCommon/goldfish_dma.cpp
index 0c87329396fcf3351f8ef81baf7deaad6ca46614..16bf84e25b3c68c51785fe2d90bf3caac1979064 100644
--- a/shared/OpenglCodecCommon/goldfish_dma.cpp
+++ b/shared/OpenglCodecCommon/goldfish_dma.cpp
@@ -15,7 +15,11 @@
 #include "goldfish_dma.h"
 #include "qemu_pipe.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #include <errno.h>
 #ifdef __ANDROID__
 #include <linux/ioctl.h>
@@ -105,7 +109,7 @@ void* goldfish_dma_map(struct goldfish_dma_context* cxt) {
 }
 
 int goldfish_dma_unmap(struct goldfish_dma_context* cxt) {
-    ALOGV("%s: cxt=%p mapped=0x" PRIu64, __FUNCTION__, cxt, cxt->mapped_addr);
+    ALOGV("%s: cxt=%p mapped=0x%" PRIu64, __FUNCTION__, cxt, cxt->mapped_addr);
     munmap(reinterpret_cast<void *>(cxt->mapped_addr), cxt->size);
     cxt->mapped_addr = 0;
     cxt->size = 0;
diff --git a/shared/OpenglCodecCommon/qemu_pipe.h b/shared/OpenglCodecCommon/qemu_pipe.h
index 75eecb0f93f4dfd250d74eff1f9e5991b1a56068..429b3fea7d7a4c4870044697aa5449b33e676bc8 100644
--- a/shared/OpenglCodecCommon/qemu_pipe.h
+++ b/shared/OpenglCodecCommon/qemu_pipe.h
@@ -55,7 +55,11 @@ typedef int QEMU_PIPE_HANDLE;
 #include <stdint.h>
 #endif
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #ifdef __ANDROID__
 #include <sys/cdefs.h>
 #endif
diff --git a/shared/OpenglCodecCommon/qemu_pipe_host.cpp b/shared/OpenglCodecCommon/qemu_pipe_host.cpp
index b4dc2af28f8db5105c7528658f688d60faad2d7c..e1a3b450de09f9f14ade4c502bb08575a60a17ea 100644
--- a/shared/OpenglCodecCommon/qemu_pipe_host.cpp
+++ b/shared/OpenglCodecCommon/qemu_pipe_host.cpp
@@ -15,7 +15,11 @@
 
 #include "android/emulation/hostpipe/HostGoldfishPipe.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 
 using android::HostGoldfishPipeDevice;
 
diff --git a/system/GLESv1_enc/GLEncoder.cpp b/system/GLESv1_enc/GLEncoder.cpp
index 968dfd65c2f5d5d8eddfe0fa4e5796a12f837376..1fa0dac1c31aa4c4358ef48a1bf33e0a2d7c171e 100644
--- a/system/GLESv1_enc/GLEncoder.cpp
+++ b/system/GLESv1_enc/GLEncoder.cpp
@@ -16,7 +16,13 @@
 #include "GLEncoder.h"
 #include "glUtils.h"
 #include "FixedBuffer.h"
+
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
+
 #include <assert.h>
 
 #ifndef MIN
diff --git a/system/OpenglSystemCommon/FormatConversions.cpp b/system/OpenglSystemCommon/FormatConversions.cpp
index 8213602b0fd4a1a79ef3fe1de461e6cdfa078e11..a14e731f010daba2ffe882bf02f4fdce089bde5e 100644
--- a/system/OpenglSystemCommon/FormatConversions.cpp
+++ b/system/OpenglSystemCommon/FormatConversions.cpp
@@ -14,7 +14,11 @@
 
 #include "FormatConversions.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #include <string.h>
 
 #define DEBUG 0
diff --git a/system/OpenglSystemCommon/HostConnection.cpp b/system/OpenglSystemCommon/HostConnection.cpp
index 2457ed32dc7dc7d1d43590090dee3737cbb292ac..5e0507308a623c88cfb094c2856d1808fd769fe3 100644
--- a/system/OpenglSystemCommon/HostConnection.cpp
+++ b/system/OpenglSystemCommon/HostConnection.cpp
@@ -62,7 +62,11 @@ using goldfish_vk::VkEncoder;
 #include "VirtioGpuStream.h"
 #endif
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 
 #define STREAM_BUFFER_SIZE  (4*1024*1024)
 #define STREAM_PORT_NUM     22468
diff --git a/system/OpenglSystemCommon/ProcessPipe.cpp b/system/OpenglSystemCommon/ProcessPipe.cpp
index 08e957175ca5b153b90f0bcf9328d3cc9fffb581..ad0527ac866031586bfd98a33a19673b3827a228 100644
--- a/system/OpenglSystemCommon/ProcessPipe.cpp
+++ b/system/OpenglSystemCommon/ProcessPipe.cpp
@@ -17,7 +17,11 @@
 #include "renderControl_enc.h"
 #include "qemu_pipe.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #include <pthread.h>
 #include <errno.h>
 
diff --git a/system/OpenglSystemCommon/QemuPipeStream.cpp b/system/OpenglSystemCommon/QemuPipeStream.cpp
index dbf6f9538c3f06bdaf06d09a2adcb48affbd5cdb..fb515c99271f707a0cb048ba589350a402ff0270 100644
--- a/system/OpenglSystemCommon/QemuPipeStream.cpp
+++ b/system/OpenglSystemCommon/QemuPipeStream.cpp
@@ -15,7 +15,11 @@
 */
 #include "QemuPipeStream.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/system/egl/egl.cpp b/system/egl/egl.cpp
index c7794d76e17369ca9ba2678984efc158c68383e6..3e4698fcfddc06a0a58dd9d99d6406cd1ffc8b03 100644
--- a/system/egl/egl.cpp
+++ b/system/egl/egl.cpp
@@ -20,7 +20,11 @@
 #include "eglDisplay.h"
 #include "eglSync.h"
 #include "egl_ftable.h"
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #include <cutils/properties.h>
 #include "goldfish_sync.h"
 #include "GLClientState.h"
diff --git a/system/gralloc/gralloc.cpp b/system/gralloc/gralloc.cpp
index 43843b2162c14812d3387cd841e1bd4214988a3c..2329abd98820cba5e82f79205a37f67fdb8d4825 100644
--- a/system/gralloc/gralloc.cpp
+++ b/system/gralloc/gralloc.cpp
@@ -36,7 +36,11 @@
 #include "glUtils.h"
 #include "qemu_pipe.h"
 
+#if PLATFORM_SDK_VERSION < 26
 #include <cutils/log.h>
+#else
+#include <log/log.h>
+#endif
 #include <cutils/properties.h>
 
 #include <set>
diff --git a/system/vulkan_enc/VulkanStreamGuest.cpp b/system/vulkan_enc/VulkanStreamGuest.cpp
index c250b5ded1adfcd212b47b2c221a00bc9e019ac9..bbb54379399234d9cdf5978f8a4fc7908d1c1322 100644
--- a/system/vulkan_enc/VulkanStreamGuest.cpp
+++ b/system/vulkan_enc/VulkanStreamGuest.cpp
@@ -20,7 +20,7 @@
 
 #include <vector>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <inttypes.h>
 
 namespace goldfish_vk {
diff --git a/tests/gles_android_wrapper/ServerConnection.cpp b/tests/gles_android_wrapper/ServerConnection.cpp
index ff4e39001553689dc69b95daee066ae10f19ba90..ea84aa225483662fa3f81f2bd5f9e5af08f29155 100644
--- a/tests/gles_android_wrapper/ServerConnection.cpp
+++ b/tests/gles_android_wrapper/ServerConnection.cpp
@@ -18,7 +18,7 @@
 #include "ServerConnection.h"
 #include "TcpStream.h"
 #include "QemuPipeStream.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "ThreadInfo.h"
 
 gl_client_context_t *ServerConnection::s_getGlContext()
diff --git a/tests/gles_android_wrapper/egl.cpp b/tests/gles_android_wrapper/egl.cpp
index cc9ab0bd3b38c88e47709a5ccdea5e65758704a7..33090d5da00a9f68264b9325e1cf0437b7161ad9 100644
--- a/tests/gles_android_wrapper/egl.cpp
+++ b/tests/gles_android_wrapper/egl.cpp
@@ -27,7 +27,7 @@
 #include <dlfcn.h>
 #include "egl_dispatch.h"
 #include "egl_ftable.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "ServerConnection.h"
 #include "ThreadInfo.h"
 #include <pthread.h>
diff --git a/tests/gles_android_wrapper/gles.cpp b/tests/gles_android_wrapper/gles.cpp
index c0949c8c3cfebba66c24830fea53538cba11b5ca..6a0087ed60e4856ddd05085ba8482dd771950377 100644
--- a/tests/gles_android_wrapper/gles.cpp
+++ b/tests/gles_android_wrapper/gles.cpp
@@ -19,7 +19,7 @@
 #include "gles_dispatch.h"
 #include "gles_ftable.h"
 #include <EGL/egl.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 static struct gles_dispatch *s_dispatch = NULL;