diff --git a/cc/cc.go b/cc/cc.go
index 9e1c1720d..abe003e65 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -969,7 +969,7 @@ func (c *Module) isCoverageVariant() bool {
 }
 
 func (c *Module) IsNdk() bool {
-	return inList(c.Name(), ndkKnownLibs)
+	return inList(c.BaseModuleName(), ndkKnownLibs)
 }
 
 func (c *Module) isLlndk(config android.Config) bool {
diff --git a/cc/lto.go b/cc/lto.go
index ed3abe7ea..9868cdfb9 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -152,9 +152,7 @@ func ltoDepsMutator(mctx android.TopDownMutatorContext) {
 
 			// Do not recurse down non-static dependencies
 			if isLibTag {
-				// TODO(ccross): the staticUnwinder check is there to maintain existing behavior
-				//   when adding libraryDependencyTag and should be removed.
-				if !libTag.static() || libTag.staticUnwinder {
+				if !libTag.static() {
 					return false
 				}
 			} else {
diff --git a/java/app.go b/java/app.go
index a873cbdda..e21dcc014 100755
--- a/java/app.go
+++ b/java/app.go
@@ -875,9 +875,7 @@ func collectAppDeps(ctx android.ModuleContext, app appDepsInterface,
 		otherName := ctx.OtherModuleName(module)
 		tag := ctx.OtherModuleDependencyTag(module)
 
-		// TODO(ccross): The tag == cc.SharedDepTag() check should be cc.IsSharedDepTag(tag) but
-		//   was left to maintain behavior when adding libraryDependencyTag.
-		if IsJniDepTag(tag) || tag == cc.SharedDepTag() {
+		if IsJniDepTag(tag) || cc.IsSharedDepTag(tag) {
 			if dep, ok := module.(*cc.Module); ok {
 				if dep.IsNdk() || dep.IsStubs() {
 					return false