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

Change-Id: I654fcdb478dfae98d78b0353e068122d115dd2c5