[automerger skipped] Merge "Split fork and specialize in zygote" am: f40f05229c  -s ours
am: 984fc6eae1  -s ours

Change-Id: I0ac0bcd1c3f9242d4a2efab56627a61baf79676c