diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 936cda7..04666d9 100644
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -15,6 +15,27 @@ function vendor_imports() {
 EOF
 }
 
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+
+    case "$1" in
+        libagmclient | \
+        libagmmixer | \
+        vendor.qti.hardware.pal@1.0-impl)
+            ;;
+        *)
+            return 1
+    esac
+}
+
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" || \
+    lib_to_package_fixup_proto_3_9_1 "$1" || \
+    lib_to_package_fixup_vendor_variants "$@"
+}
+
 # If we're being sourced by the common script that we called,
 # stop right here. No need to go down the rabbit hole.
 if [ "${BASH_SOURCE[0]}" != "${0}" ]; then