--- a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk	Fri Apr 01 16:46:32 2016 +0300
+++ b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk	Fri Apr 01 17:08:53 2016 +0200
@@ -25,8 +25,7 @@
 
 include Modules.gmk
 
-IMPORTED_MODULES := $(call FindImportedModules)
-$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
+$(eval $(call ReadImportMetaData))
 
 # Replacing double-comma with a single comma is to workaround the issue
 # with some version of make on windows that doesn't substitute spaces