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

Change-Id: Idfb6717b63db717cbd449172a45672bd501146f5