Support @utf8InCpp List<String>

Bug: 26729450
Change-Id: I2ac61aadef4c3ff0527fe68b3a104f72821dd2c4
Test: unit, integration tests pass
diff --git a/type_java.cpp b/type_java.cpp
index bc6167b..18d27a2 100644
--- a/type_java.cpp
+++ b/type_java.cpp
@@ -713,7 +713,7 @@
 
 GenericListType::GenericListType(const JavaTypeNamespace* types,
                                  const Type* contained_type)
-    : Type(types, "java.util", "List<" + contained_type->JavaType() + ">",
+    : Type(types, "java.util", "List<" + contained_type->CanonicalName() + ">",
            ValidatableType::KIND_BUILT_IN, true, true),
       m_contained_type(contained_type),
       m_creator(contained_type->CreatorName()) {}