Merge "Code cleanup in ZygoteInit."