Merge "Revert^2 "Fix 036-finalizer for JIT-at-first-use gcstress.""