diff --git a/config/common/gen6pixel.yml b/config/common/gen6pixel.yml
index 15177df..b2637e3 100644
--- a/config/common/gen6pixel.yml
+++ b/config/common/gen6pixel.yml
@@ -4,3 +4,15 @@ platform:
 
 includes:
   - pixel.yml
+
+filters:
+  dep_files:
+    match:
+      # external/android-nn-driver/Android.mk: error: "android.hardware.neuralnetworks@1.0-service-armnn (EXECUTABLES android-arm64) missing libOpenCL (SHARED_LIBRARIES android-arm64)"
+      - vendor/lib/libOpenCL.so
+      - vendor/lib64/libOpenCL.so
+  files:
+    match:
+      # Remove Google screw-up with USB hardware debugging
+      - vendor/bin/uci_daemon
+      - vendor/etc/init/usb-cdc.rc
diff --git a/config/oriole.yml b/config/oriole.yml
index 1e03df6..ad2cf4f 100644
--- a/config/oriole.yml
+++ b/config/oriole.yml
@@ -6,3 +6,9 @@ platform:
 
 includes:
   - common/gen6pixel.yml
+
+filters:
+  overlay_files:
+    match:
+      # aapt2 parsing bug encountered within adevtool
+      - HbmSVManager__auto_generated_rro_product.apk