Need to add
jdk/test/lib/containers jdk/test/lib/security
to the build

diff
diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index dceae073ff3..2547c007b33 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -60,7 +60,6 @@ TARGETS += $(BUILD_WB_JAR)
 $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
     TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
     SRC := $(TEST_LIB_SOURCE_DIR), \
- EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \
     BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
     HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
     JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
@@ -70,7 +69,10 @@ $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
         --add-exports java.base/jdk.internal.classfile.attribute=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.classfile.constantpool=ALL-UNNAMED \
         --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
- --enable-preview, \
+ --add-exports java.base/jdk.internal.platform=ALL-UNNAMED \
+ --add-exports java.base/sun.security.pkcs=ALL-UNNAMED \
+ --add-exports java.base/sun.security.tools.keytool=ALL-UNNAMED \
+ --add-exports java.base/sun.security.x509=ALL-UNNAMED, \
 ))

 TARGETS += $(BUILD_TEST_LIB_JAR)