--- a/make/Images.gmk	Thu Mar 31 01:13:17 2016 -0700
+++ b/make/Images.gmk	Thu Mar 31 14:11:15 2016 -0700
@@ -41,7 +41,8 @@
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
 
-$(eval $(call ReadImportMetaData))
+IMPORTED_MODULES := $(call FindImportedModules)
+$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
 
 JRE_MODULES += $(filter-out $(MODULES_FILTER), $(BOOT_MODULES) $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
 JDK_MODULES += $(filter-out $(MODULES_FILTER), $(ALL_MODULES))