build error in jdk9/hs-comp/?

[Anthony Scarpino]

Anyone else seeing the below error with CompileDemos.gmk in hs-comp?  I 
updated my repo and brought over a new fresh one, but got the same 
failure.  "--enable-deploy=no" works around the problem.

$ make images
Compiling 5 files for BUILD_GENMODULESLIST
Building target 'images' in configuration 
'linux-x86_64-normal-server-release'
Compiling 8 files for BUILD_TOOLS_LANGTOOLS
make[3]: CompileDemos.gmk: No such file or directory
make[3]: *** No rule to make target 'CompileDemos.gmk'.  Stop.
make[2]: *** [demos-deploy] Error 1

Tony