Merge "Netd callbacks for socket calls in Bionic" am: 860ae7cd02 am: 37b0307d8c am: fb6e847d84

Change-Id: Ib1a49d2668db0869c004bd03e214b3f53ee8fbcb