hg: jdk9/sandbox/jdk: JEP-223-branch: Revert manifest manipulation from Tools.gmk where it did not work properly.

[magnus.ihse.bursie at oracle.com]

Changeset: bb64e32a20cc
Author:    ihse
Date:      2015-05-19 00:01 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jdk/rev/bb64e32a20cc

JEP-223-branch: Revert manifest manipulation from Tools.gmk where it did not work properly.

! make/CompileDemos.gmk
! make/Tools.gmk