[automerger skipped] Merge "Don't defer zygote" am: e820afdadb am: 7b1d78b008
am: 69eaa6b07b -s ours
am skip reason: change_id Ib4d0716ed5225b6ade3adaa247ff6140a9b2b9d5 with SHA1 3bddd540dd is in history

Change-Id: Ie42bc2d7ff2804830b19499f7c599bcf4bfd7216