diff --git a/media-libs/arc-mesa/arc-mesa-19.0-r35.ebuild b/media-libs/arc-mesa/arc-mesa-19.0-r36.ebuild
similarity index 100%
rename from media-libs/arc-mesa/arc-mesa-19.0-r35.ebuild
rename to media-libs/arc-mesa/arc-mesa-19.0-r36.ebuild
diff --git a/media-libs/arc-mesa/arc-mesa-19.0.ebuild b/media-libs/arc-mesa/arc-mesa-19.0.ebuild
index f6b37d1..37d0fe5 100644
--- a/media-libs/arc-mesa/arc-mesa-19.0.ebuild
+++ b/media-libs/arc-mesa/arc-mesa-19.0.ebuild
@@ -36,8 +36,8 @@
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	android_aep android-container-nyc -android_gles2 -android_gles30
-	+android_gles31 -android_gles32	-android_vulkan_compute_0
+	android_aep -android_gles2 -android_gles30
+	+android_gles31 -android_gles32 -android_vulkan_compute_0
 	cheets +classic debug dri egl +gallium
 	-gbm gles1 gles2 +llvm +nptl pic selinux shared-glapi vulkan X xlib-glx
 	cheets_user cheets_user_64"
@@ -57,10 +57,7 @@
 
 DEPEND="cheets? (
 		>=x11-libs/arc-libdrm-2.4.82[${MULTILIB_USEDEP}]
-		llvm? (
-			android-container-nyc? ( sys-devel/arc-llvm:8=[${MULTILIB_USEDEP}] )
-			!android-container-nyc? ( >=sys-devel/arc-llvm-9:=[${MULTILIB_USEDEP}] )
-		)
+		llvm? ( >=sys-devel/arc-llvm-9:=[${MULTILIB_USEDEP}] )
 		video_cards_amdgpu? (
 			dev-libs/arc-libelf[${MULTILIB_USEDEP}]
 		)
@@ -174,11 +171,6 @@
 
 	epatch "${FILESDIR}"/BACKPORT-egl-Enable-eglGetPlatformDisplay-on-Android.patch
 
-	if use android-container-nyc; then
-		epatch "${FILESDIR}"/CHROMIUM-disable-intel_miptree_unmap_tiled_memcpy-for-ge.patch
-		epatch "${FILESDIR}"/CHROMIUM-Revert-anv-Use-absolute-timeouts-in-wait_for_bo_fenc.patch
-	fi
-
 	epatch "${FILESDIR}"/FROMLIST-anv-Fix-vulkan-build-in-meson.patch
 	epatch "${FILESDIR}"/FROMLIST-anv-Add-android-dependencies-on-android.patch
 	epatch "${FILESDIR}"/FROMLIST-radv-Fix-vulkan-build-in-meson.patch
@@ -199,10 +191,8 @@
 	epatch "${FILESDIR}"/BACKPORT-dri-Add-fp16-formats.patch
 	epatch "${FILESDIR}"/UPSTREAM-gbm-Add-buffer-handling-and-visuals-for-fp1.patch
 	epatch "${FILESDIR}"/BACKPORT-i965-Add-handling-for-fp16-configs.patch
-	if ! use android-container-nyc; then
-		epatch "${FILESDIR}"/UPSTREAM-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_FP.patch
-		epatch "${FILESDIR}"/BACKPORT-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_10.patch
-	fi
+	epatch "${FILESDIR}"/UPSTREAM-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_FP.patch
+	epatch "${FILESDIR}"/BACKPORT-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_10.patch
 	epatch "${FILESDIR}"/UPSTREAM-intel-compiler-force-simd8-when-dual-src-blending-on.patch
 
 	epatch "${FILESDIR}"/UPSTREAM-i965-setup-sized-internalformat-for-MESA_FO.patch
@@ -470,18 +460,10 @@
 			doins "${FILESDIR}/android.hardware.vulkan.level-0.xml"
 		fi
 
-		# Limit the Vulkan version to 1.0 before Android Pie. The
-		# Nougat and Oreo CTS reject 1.1 in test
-		# android.graphics.cts.VulkanFeaturesTest#testVulkanHardwareFeatures.
-		# (See b/136215923).
-		if ! use android-container-nyc && use video_cards_intel; then
-			doins "${FILESDIR}/android.hardware.vulkan.version-1_1.xml"
-		else
-			doins "${FILESDIR}/android.hardware.vulkan.version-1_0_3.xml"
-		fi
+		doins "${FILESDIR}/android.hardware.vulkan.version-1_1.xml"
 	fi
 
-	if use android_vulkan_compute_0 && ! use android-container-nyc; then
+	if use android_vulkan_compute_0; then
 		einfo "Using android vulkan_compute_0."
 		insinto "${ARC_CONTAINER_PREFIX}/vendor/etc/permissions"
 		doins "${FILESDIR}/android.hardware.vulkan.compute-0.xml"
diff --git a/media-libs/arc-mesa/arc-mesa-9999.ebuild b/media-libs/arc-mesa/arc-mesa-9999.ebuild
index 7c946e6..103419a 100644
--- a/media-libs/arc-mesa/arc-mesa-9999.ebuild
+++ b/media-libs/arc-mesa/arc-mesa-9999.ebuild
@@ -33,7 +33,7 @@
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	android_aep android-container-nyc -android_gles2 -android_gles30
+	android_aep -android_gles2 -android_gles30
 	+android_gles31 -android_gles32 -android_vulkan_compute_0
 	cheets +classic debug dri egl +gallium
 	-gbm gles1 gles2 +llvm +nptl pic selinux shared-glapi vulkan X xlib-glx
@@ -54,10 +54,7 @@
 
 DEPEND="cheets? (
 		>=x11-libs/arc-libdrm-2.4.82[${MULTILIB_USEDEP}]
-		llvm? (
-			android-container-nyc? ( sys-devel/arc-llvm:8=[${MULTILIB_USEDEP}] )
-			!android-container-nyc? ( >=sys-devel/arc-llvm-9:=[${MULTILIB_USEDEP}] )
-		)
+		llvm? ( >=sys-devel/arc-llvm-9:=[${MULTILIB_USEDEP}] )
 		video_cards_amdgpu? (
 			dev-libs/arc-libelf[${MULTILIB_USEDEP}]
 		)
@@ -171,11 +168,6 @@
 
 	epatch "${FILESDIR}"/BACKPORT-egl-Enable-eglGetPlatformDisplay-on-Android.patch
 
-	if use android-container-nyc; then
-		epatch "${FILESDIR}"/CHROMIUM-disable-intel_miptree_unmap_tiled_memcpy-for-ge.patch
-		epatch "${FILESDIR}"/CHROMIUM-Revert-anv-Use-absolute-timeouts-in-wait_for_bo_fenc.patch
-	fi
-
 	epatch "${FILESDIR}"/FROMLIST-anv-Fix-vulkan-build-in-meson.patch
 	epatch "${FILESDIR}"/FROMLIST-anv-Add-android-dependencies-on-android.patch
 	epatch "${FILESDIR}"/FROMLIST-radv-Fix-vulkan-build-in-meson.patch
@@ -194,10 +186,8 @@
 	epatch "${FILESDIR}"/BACKPORT-dri-Add-fp16-formats.patch
 	epatch "${FILESDIR}"/UPSTREAM-gbm-Add-buffer-handling-and-visuals-for-fp1.patch
 	epatch "${FILESDIR}"/BACKPORT-i965-Add-handling-for-fp16-configs.patch
-	if ! use android-container-nyc; then
-		epatch "${FILESDIR}"/UPSTREAM-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_FP.patch
-		epatch "${FILESDIR}"/BACKPORT-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_10.patch
-	fi
+	epatch "${FILESDIR}"/UPSTREAM-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_FP.patch
+	epatch "${FILESDIR}"/BACKPORT-egl-android-Enable-HAL_PIXEL_FORMAT_RGBA_10.patch
 	epatch "${FILESDIR}"/UPSTREAM-intel-compiler-force-simd8-when-dual-src-blending-on.patch
 
 	epatch "${FILESDIR}"/UPSTREAM-i965-setup-sized-internalformat-for-MESA_FO.patch
@@ -466,7 +456,7 @@
 		fi
 	fi
 
-	if use android_vulkan_compute_0 && ! use android-container-nyc; then
+	if use android_vulkan_compute_0; then
 		einfo "Using android vulkan_compute_0."
 		insinto "${ARC_CONTAINER_PREFIX}/vendor/etc/permissions"
 		doins "${FILESDIR}/android.hardware.vulkan.compute-0.xml"