Merge "Revert "Reset stack guard after fork from Zygote""