diff --git a/cc/kernel_headers.go b/cc/kernel_headers.go
index c66fca6..42dc770 100644
--- a/cc/kernel_headers.go
+++ b/cc/kernel_headers.go
@@ -40,12 +40,9 @@
 		libraryDecorator: library,
 	}
 
-	module.compiler = nil
 	module.linker = stub
-	module.installer = nil
 
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibBoth)
-	return module
+	return module.Init()
 }
 
 func init() {