  # define SI_LINUX_NOT_ANDROID 1
  #else
  # define SI_LINUX_NOT_ANDROID 0
-diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
 index b7fa6e8..431e8b2 100644
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
 @@ -22,6 +22,11 @@
  #ifdef _FILE_OFFSET_BITS
  #undef _FILE_OFFSET_BITS

 
 #if !SANITIZER_ANDROID
 void ReadContextStack(void *context, uptr *stack, uptr *ssize) {
diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc
index d07f060..e705940 100644
--- a/lib/interception/interception_linux.cc
+++ b/lib/interception/interception_linux.cc
@@ -58,8 +58,8 @@ bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func,
   return addr && (func == wrapper);
 }

 
 // True if this is a nested interceptor.
 static THREADLOCAL int in_interceptor_scope;
diff --git a/lib/msan/msan_linux.cpp b/lib/msan/msan_linux.cpp
index 3b6e6cb..6186260 100644
--- a/lib/msan/msan_linux.cpp
+++ b/lib/msan/msan_linux.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
