Mojo code generator: simplify how imported types and values are handled.

mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

Index: mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
index 19d806d26eaa06a04670a8389227754f1da7b647..6460ebac40847ef7031bf21ff4d9aa5e79d1cc12 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl
@@ -61,9 +61,9 @@ namespace {{variant}} {
 #include "{{module.path}}-shared.h"
 {%- for import in imports %}
 {%-   if variant %}
-#include "{{"%s-%s.h"|format(import.module.path, variant)}}"
+#include "{{"%s-%s.h"|format(import.path, variant)}}"
 {%-   else %}
-#include "{{import.module.path}}.h"
+#include "{{import.path}}.h"
 {%-   endif %}
 {%- endfor %}
 {%- if not for_blink %}