diff --git a/cc/sanitize.go b/cc/sanitize.go
index a1eae4e..c9fcafc 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -226,13 +226,9 @@
 
 	// Enable CFI for all components in the include paths
 	if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {
-		// Do not rely on include paths for anything other than ARM64.
-		// TODO: Relax this constraint for 2019.
-		if ctx.Arch().ArchType == android.Arm64 {
-			s.Cfi = boolPtr(true)
-			if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
-				s.Diag.Cfi = boolPtr(true)
-			}
+		s.Cfi = boolPtr(true)
+		if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {
+			s.Diag.Cfi = boolPtr(true)
 		}
 	}