diff --git a/cc/androidmk.go b/cc/androidmk.go
index 4986387..c19aa17 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -201,6 +201,7 @@
 
 func (c *stubDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {
 	ret.SubName = "." + strconv.Itoa(c.properties.ApiLevel)
+	ret.Class = "SHARED_LIBRARIES"
 
 	ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) error {
 		path, file := filepath.Split(c.installPath)
diff --git a/cc/ndk_library.go b/cc/ndk_library.go
index 85c2092..fe52b0e 100644
--- a/cc/ndk_library.go
+++ b/cc/ndk_library.go
@@ -265,7 +265,7 @@
 	stub.installPath = ctx.InstallFile(installDir, path).String()
 }
 
-func newStubLibrary() *Module {
+func newStubLibrary() (*Module, []interface{}) {
 	module, library := NewLibrary(android.DeviceSupported, true, false)
 	module.stl = nil
 	module.sanitize = nil
@@ -278,10 +278,11 @@
 	module.linker = stub
 	module.installer = stub
 
-	return module
+	return module, []interface{}{&stub.properties}
 }
 
 func ndkLibraryFactory() (blueprint.Module, []interface{}) {
-	module := newStubLibrary()
-	return module.Init()
+	module, properties := newStubLibrary()
+	return android.InitAndroidArchModule(module, android.DeviceSupported,
+		android.MultilibBoth, properties...)
 }