[automerger skipped] Merge "Code cleanup in ZygoteInit." am: 889648df40 am: 6b7e35d216
am: a13898896c -s ours
am skip reason: change_id I0d348caa1d9ca2a4c1e32430e0eebdd91672e473 with SHA1 143f7cc78e is in history

Change-Id: I660cf1e2e818d62beece1db547926548baf35454