Merge "init.rc: add a new zygote-start trigger" am: 4e5e797d26
am: 0d9416ba2e

Change-Id: Ibd8a768b0d76dcd71eb5f8c17528af78074c8ca3