diff --git a/README.chromium b/README.chromium
index 1f07107a2..4437eebb9 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: https://chromium.googlesource.com/libyuv/libyuv/
-Version: 1914
+Version: 1915
 License: BSD-3-Clause
 License File: LICENSE
 Shipped: yes
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 5d06b3bf2..a17ff78b9 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1914
+#define LIBYUV_VERSION 1915
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/libyuv.gyp b/libyuv.gyp
index c2ea78c91..d4973b0db 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -146,7 +146,6 @@
         # Enable the following 3 macros to turn off assembly for specified CPU.
         # 'LIBYUV_DISABLE_X86',
         # 'LIBYUV_DISABLE_NEON',
-        # 'LIBYUV_DISABLE_DSPR2',
         # Enable the following macro to build libyuv as a shared library (dll).
         # 'LIBYUV_USING_SHARED_LIBRARY',
         # TODO(fbarchard): Make these into gyp defines.
diff --git a/unit_test/convert_argb_test.cc b/unit_test/convert_argb_test.cc
index c36f37c35..b57abb15a 100644
--- a/unit_test/convert_argb_test.cc
+++ b/unit_test/convert_argb_test.cc
@@ -2801,7 +2801,10 @@ TEST_F(LibYUVConvertTest, TestARGBToUVRow) {
 }
 #endif
 
-#if defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__)
+#if !defined(DISABLE_SLOW_TESTS) && \
+    (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__))
+// TODO(fbarchard): Consider _set_new_mode(0) to make malloc return NULL
+
 TEST_F(LibYUVConvertTest, TestI400LargeSize) {
   // The width and height are chosen as follows:
   // - kWidth * kHeight is not a multiple of 8: This lets us to use the Any
@@ -2816,7 +2819,8 @@ TEST_F(LibYUVConvertTest, TestI400LargeSize) {
   int has_large_malloc = 1;
 #endif
   if (!has_large_malloc) {
-    printf("WARNING: Skipped.  Large allocation may assert for %ld\n", (size_t)kWidth * kHeight);
+    printf("WARNING: Skipped.  Large allocation may assert for %zd\n",
+           (size_t)kWidth * kHeight);
     return;
   }
 
@@ -2824,11 +2828,13 @@ TEST_F(LibYUVConvertTest, TestI400LargeSize) {
   // in convert_argb.cc (they are triggered only when stride is equal to width).
   const size_t kStride = kWidth + 1;
 
-  printf("WARNING: attempting to allocate I400 image of %zd bytes\n", (size_t)kWidth * kHeight);
+  printf("WARNING: attempting to allocate I400 image of %zd bytes\n",
+         (size_t)kWidth * kHeight);
   fflush(stdout);
   align_buffer_page_end(orig_i400, (size_t)kWidth * kHeight);
   if (!orig_i400) {
-    printf("WARNING: unable to allocate I400 image of %zd bytes\n", (size_t)kWidth * kHeight);
+    printf("WARNING: unable to allocate I400 image of %zd bytes\n",
+           (size_t)kWidth * kHeight);
     fflush(stdout);
     return;
   }
@@ -2836,7 +2842,8 @@ TEST_F(LibYUVConvertTest, TestI400LargeSize) {
   fflush(stdout);
   align_buffer_page_end(dest_argb, (size_t)kWidth * kHeight * 4);
   if (!dest_argb) {
-    printf("WARNING: unable to allocate ARGB image of %zd bytes\n", (size_t)kWidth * kHeight * 4);
+    printf("WARNING: unable to allocate ARGB image of %zd bytes\n",
+           (size_t)kWidth * kHeight * 4);
     fflush(stdout);
     free_aligned_buffer_page_end(orig_i400);
     return;
diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc
index 54a782e18..dde6d1120 100644
--- a/unit_test/cpu_test.cc
+++ b/unit_test/cpu_test.cc
@@ -342,7 +342,7 @@ static int FileExists(const char* file_name) {
   return 1;
 }
 
-TEST_F(LibYUVBaseTest, TestLinuxArm) {
+TEST_F(LibYUVBaseTest, DISABLED_TestLinuxArm) {
   if (FileExists("../../unit_test/testdata/arm_v7.txt")) {
     printf("Note: testing to load \"../../unit_test/testdata/arm_v7.txt\"\n");
 
@@ -388,7 +388,7 @@ TEST_F(LibYUVBaseTest, TestLinuxAArch64) {
 }
 #endif
 
-TEST_F(LibYUVBaseTest, TestLinuxMipsMsa) {
+TEST_F(LibYUVBaseTest, DISABLED_TestLinuxMipsMsa) {
   if (FileExists("../../unit_test/testdata/mips.txt")) {
     printf("Note: testing to load \"../../unit_test/testdata/mips.txt\"\n");
 
@@ -401,7 +401,7 @@ TEST_F(LibYUVBaseTest, TestLinuxMipsMsa) {
   }
 }
 
-TEST_F(LibYUVBaseTest, TestLinuxRVV) {
+TEST_F(LibYUVBaseTest, DISABLED_TestLinuxRVV) {
   if (FileExists("../../unit_test/testdata/riscv64.txt")) {
     printf("Note: testing to load \"../../unit_test/testdata/riscv64.txt\"\n");
 
@@ -427,12 +427,7 @@ TEST_F(LibYUVBaseTest, TestLinuxRVV) {
 #endif
 }
 
-// TODO(fbarchard): Fix clangcl test of cpuflags.
-#ifdef _MSC_VER
-TEST_F(LibYUVBaseTest, DISABLED_TestSetCpuFlags) {
-#else
 TEST_F(LibYUVBaseTest, TestSetCpuFlags) {
-#endif
   // Reset any masked flags that may have been set so auto init is enabled.
   MaskCpuFlags(0);
 
diff --git a/unit_test/unit_test.h b/unit_test/unit_test.h
index af5484b68..2c11c983f 100644
--- a/unit_test/unit_test.h
+++ b/unit_test/unit_test.h
@@ -14,7 +14,7 @@
 #include <stddef.h>  // For NULL
 #ifdef _WIN32
 #include <windows.h>
-#else
+#elif !defined(__hexagon__)
 #include <sys/time.h>
 #endif
 
@@ -102,6 +102,10 @@ static inline double get_time() {
   QueryPerformanceFrequency(&f);
   return static_cast<double>(t.QuadPart) / static_cast<double>(f.QuadPart);
 }
+#elif defined(__hexagon__)
+static inline double get_time() {
+  return 0.;
+}
 #else
 static inline double get_time() {
   struct timeval t;
diff --git a/util/cpuid.c b/util/cpuid.c
index df1be880c..e48f215fa 100644
--- a/util/cpuid.c
+++ b/util/cpuid.c
@@ -179,13 +179,6 @@ int main(int argc, const char* argv[]) {
     cpu_info[3] = 0;
     printf("Cpu Vendor: %s\n", (char*)(&cpu_info[0]));
 
-    for (int n = 0; n < num_cpus; ++n) {
-      // Check EDX bit 15 for hybrid design indication
-      CpuId(7, n, &cpu_info[0]);
-      int hybrid = (cpu_info[3] >> 15) & 1;
-      printf("  Cpu %d Hybrid %d\n", n, hybrid);
-    }
-
     // CPU Family and Model
     // 3:0 - Stepping
     // 7:4 - Model