Merge "Code cleanup in ZygoteInit."
am: 889648df40

Change-Id: I236f851fe38c16e5f0ad54d64b6ff81bcb090b9e