[automerger skipped] Merge "Split fork and specialize in zygote" am: f40f0522 -s ours am: 984fc6ea -s ours am: 499a6a34 -s ours Change-Id: I73f877e1185d5d77224cc3a4dbfb54f0c0442b1a