clean up CL for androidmk variables

Change-Id: If14d1925bea78f467740f8395f1d529db00b618c
diff --git a/cc/library.go b/cc/library.go
index 1291f5c..ed219b6 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -936,6 +936,8 @@
 		// implementation.
 		i.(*libraryDecorator).collectedSnapshotHeaders = android.Paths{}
 	}
+
+	handler.module.setAndroidMkVariablesFromCquery(ccInfo.CcAndroidMkInfo)
 }
 
 func (library *libraryDecorator) setFlagExporterInfoFromCcInfo(ctx android.ModuleContext, ccInfo cquery.CcInfo) {