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

Change-Id: If3fc76772946ee336e7b049deddadd7a75a2158a