8008447: Tweaks to make all NEWBUILD=false round 3

Reviewed-by: jjh, sundar
Contributed-by: james.laskey@oracle.com

make/launchers/Makefile

@@ -77,10 +77,12 @@ $(call make-launcher, jmap, sun.tools.jmap.JMap, \
   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
 $(call make-launcher, jps, sun.tools.jps.Jps, , )
 $(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , )
+ifeq ("$(NEWBUILD)","true")
 $(call make-launcher, jjs, jdk.nashorn.tools.Shell, \
   -J-XX:-TieredCompilation \
   -J-Xms2G \
   -J-Xmx2G, )
+endif
 $(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , )
 $(call make-launcher, jstack, sun.tools.jstack.JStack, \
   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \