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

Change-Id: I56e6907db4063f6b527be710b00de9200aa8914a