diff --git a/android/arch.go b/android/arch.go
index df50afa0c..5a88f23da 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -217,7 +217,8 @@ type OsType struct {
 type OsClass int
 
 const (
-	Device OsClass = iota
+	Generic OsClass = iota
+	Device
 	Host
 	HostCross
 )
diff --git a/android/module.go b/android/module.go
index 7b35d32f0..6474e47d6 100644
--- a/android/module.go
+++ b/android/module.go
@@ -631,7 +631,7 @@ func (a *androidModuleContext) InstallFileName(installPath OutputPath, name stri
 	a.module.base().hooks.runInstallHooks(a, fullInstallPath, false)
 
 	if !a.module.base().commonProperties.SkipInstall &&
-		(a.Host() || !a.AConfig().SkipDeviceInstall()) {
+		(!a.Device() || !a.AConfig().SkipDeviceInstall()) {
 
 		deps = append(deps, a.installDeps...)
 
@@ -669,7 +669,7 @@ func (a *androidModuleContext) InstallSymlink(installPath OutputPath, name strin
 	a.module.base().hooks.runInstallHooks(a, fullInstallPath, true)
 
 	if !a.module.base().commonProperties.SkipInstall &&
-		(a.Host() || !a.AConfig().SkipDeviceInstall()) {
+		(!a.Device() || !a.AConfig().SkipDeviceInstall()) {
 
 		a.ModuleBuild(pctx, ModuleBuildParams{
 			Rule:      Symlink,
diff --git a/cc/ndk_headers.go b/cc/ndk_headers.go
index a40fc72c8..e4a790f48 100644
--- a/cc/ndk_headers.go
+++ b/cc/ndk_headers.go
@@ -138,12 +138,7 @@ func (m *headerModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 
 func ndkHeadersFactory() (blueprint.Module, []interface{}) {
 	module := &headerModule{}
-	// Host module rather than device module because device module install steps
-	// do not get run when embedded in make. We're not any of the existing
-	// module types that can be exposed via the Android.mk exporter, so just use
-	// a host module.
-	return android.InitAndroidArchModule(module, android.HostSupportedNoCross,
-		android.MultilibFirst, &module.properties)
+	return android.InitAndroidModule(module, &module.properties)
 }
 
 type preprocessedHeaderProperies struct {