Merge "Do not FixupStaticTrampolines of uninitialized classes"