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