diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index d9f87d95b..b56a547a6 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - main
-      - topic/drawable
     tags:
       - 'android-*'
     paths:
@@ -46,6 +45,17 @@ jobs:
       IS_LOCAL_DEVELOPMENT: false
       MLN_ANDROID_STL: c++_static
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: false
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: false
+
       - uses: actions/checkout@v3
         with:
           submodules: recursive
@@ -126,7 +136,6 @@ jobs:
           fi
     
       - name: Build UI tests
-        if: github.ref == 'refs/heads/main'
         run: make android-ui-test-arm-v8
 
       - name: Configure AWS Credentials
diff --git a/BUILD.bazel b/BUILD.bazel
index 58f10a0b3..a9656cf32 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,11 +1,10 @@
-load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS")
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
 load(
     "//bazel:core.bzl",
     "MLN_CORE_HEADERS",
     "MLN_CORE_SOURCE",
-    "MLN_DRAWABLES_SOURCE",
     "MLN_DRAWABLES_HEADERS",
+    "MLN_DRAWABLES_SOURCE",
     "MLN_GENERATED_SHADER_HEADERS",
     "MLN_GENERATED_STYLE_SOURCE",
     "MLN_OPENGL_HEADERS",
@@ -13,6 +12,7 @@ load(
     "MLN_PRIVATE_GENERATED_STYLE_HEADERS",
     "MLN_PUBLIC_GENERATED_STYLE_HEADERS",
 )
+load("//bazel:flags.bzl", "CPP_FLAGS", "MAPLIBRE_FLAGS")
 
 # Generate code required by the core
 filegroup(
@@ -81,30 +81,23 @@ cc_library(
     srcs = MLN_CORE_SOURCE +
            MLN_GENERATED_STYLE_SOURCE +
            MLN_OPENGL_SOURCE + select({
-            ":drawable_renderer": MLN_DRAWABLES_SOURCE,
-            ":split_renderer": MLN_DRAWABLES_SOURCE,
-            "//conditions:default": [],
-        }),
+        ":drawable_renderer": MLN_DRAWABLES_SOURCE,
+        "//conditions:default": [],
+    }),
     hdrs = MLN_CORE_HEADERS +
            MLN_OPENGL_HEADERS + select({
-            ":drawable_renderer": MLN_DRAWABLES_HEADERS,
-            ":split_renderer": MLN_DRAWABLES_HEADERS,
-            "//conditions:default": []
-        }),
+        ":drawable_renderer": MLN_DRAWABLES_HEADERS,
+        "//conditions:default": [],
+    }),
     copts = CPP_FLAGS + MAPLIBRE_FLAGS,
     defines = select({
         ":legacy_renderer": [
             "MLN_LEGACY_RENDERER=1",
-            "MLN_DRAWABLE_RENDERER=0"
+            "MLN_DRAWABLE_RENDERER=0",
         ],
         ":drawable_renderer": [
             "MLN_LEGACY_RENDERER=0",
-            "MLN_DRAWABLE_RENDERER=1"
-        ],
-        ":split_renderer": [
-            "MLN_LEGACY_RENDERER=1",
             "MLN_DRAWABLE_RENDERER=1",
-            "MLN_RENDERER_SPLIT_VIEW=1"
         ],
     }) + select({
         "//:ios": ["GLES_SILENCE_DEPRECATION=1"],
@@ -187,28 +180,24 @@ config_setting(
 string_flag(
     name = "renderer",
     build_setting_default = "legacy",
-    values=["legacy", "drawable", "split"]
+    values = [
+        "legacy",
+        "drawable",
+    ],
 )
 
 config_setting(
     name = "legacy_renderer",
     flag_values = {
-        ":renderer": "legacy"
-    }
+        ":renderer": "legacy",
+    },
 )
 
 config_setting(
     name = "drawable_renderer",
-        flag_values = {
-        ":renderer": "drawable"
-    }
-)
-
-config_setting(
-    name = "split_renderer",
     flag_values = {
-        ":renderer": "split"
-    }
+        ":renderer": "drawable",
+    },
 )
 
 exports_files(
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index aa96ae073..80724d46a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -56,9 +56,6 @@ android {
         create("drawable") {
             dimension = "renderer"
         }
-        create("split") {
-            dimension = "renderer"
-        }
     }
 
     buildFeatures {
diff --git a/render-test/android/app/build.gradle b/render-test/android/app/build.gradle
index ba2b0b497..71f7fc24f 100644
--- a/render-test/android/app/build.gradle
+++ b/render-test/android/app/build.gradle
@@ -34,7 +34,7 @@ android {
     }
     externalNativeBuild {
         cmake {
-            version '3.10.2'
+            version '3.19.0+'
             path '../../../CMakeLists.txt'
         }
     }