Merge "Elide ClinitCheck for superclasses with trivial init." am: da6220a29f
am: 5f183c8146

Change-Id: Icdce3566b6d5359232f16daf4187cc5940c0eea1