Ensure types are canonicalized when canonicalization is requested and the type is already finalized.

runtime/vm/class_finalizer.cc

Index: runtime/vm/class_finalizer.cc
===================================================================
--- runtime/vm/class_finalizer.cc	(revision 11483)
+++ runtime/vm/class_finalizer.cc	(working copy)
@@ -535,6 +535,10 @@
                                               const AbstractType& type,
                                               FinalizationKind finalization) {
   if (type.IsFinalized()) {
+    // Ensure type is canonical if canonicalization is requested.
+    if (finalization >= kCanonicalize) {
+      return type.Canonicalize();
+    }
     return type.raw();
   }
   ASSERT(type.IsResolved());