Merge "Added a new socket to Zygote init scripts." am: a8bd23124c
am: 9abd069f4d

Change-Id: Icd292f8c4d23264c14c02977c1687b9b56c20be5