Merge "CTS: Remove JDK internal class usage from JarBuildStep"