diff --git a/cc/sanitize.go b/cc/sanitize.go
index fc44eaf..205b2a2 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -256,6 +256,13 @@
 		s.Diag.Cfi = nil
 	}
 
+	// Also disable CFI for VNDK variants of components in the
+	// include paths
+	if ctx.isVndk() && ctx.useVndk() && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
+		s.Cfi = nil
+		s.Diag.Cfi = nil
+	}
+
 	if ctx.staticBinary() {
 		s.Address = nil
 		s.Coverage = nil