Merge "Allow zygote to keep socket to heapprofd." am: 4db6cb15de am: ce9b090733
am: f644eaaaa6

Change-Id: I07b1d821f34c427364260d843d6326305aec19c3