hg: jdk9/sandbox: Merge

[aleksey.shipilev at oracle.com]

Changeset: 7c9170b49251
Author:    shade
Date:      2015-11-24 22:28 +0300
URL:       http://hg.openjdk.java.net/jdk9/sandbox/rev/7c9170b49251

Merge

! make/CompileJavaModules.gmk
! make/common/SetupJavaCompilers.gmk