Merge "Rename module -> module-lib" am: 756aa63aee am: df1d1240f6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1340036

Change-Id: Iecb6be9e5bf6a25365c57dc53925511bcb0e9381
diff --git a/java/sdk.go b/java/sdk.go
index e3472ce..c4861e3 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -94,9 +94,9 @@
 	case sdkCorePlatform:
 		return "core_platform"
 	case sdkModule:
-		return "module"
+		return "module-lib"
 	case sdkSystemServer:
-		return "system_server"
+		return "system-server"
 	default:
 		return "invalid"
 	}