[automerger skipped] Merge "Added a new socket to Zygote init scripts." am: a8bd23124c am: 9abd069f4d
am: d62d80735d -s ours
am skip reason: change_id I5dbb87770b1a3100c6c122bb39ca854006bb0b0d with SHA1 ca11579b6c is in history

Change-Id: Id3dab7d8351c52c21510b451e13055e600037317