[automerger skipped] Merge "Refactor native Zygote code." am: d10870625f am: e3fed59b03
am: f786468194  -s ours

Change-Id: Iae503799080fca63352b3c26fc3fd1368df869d4