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

Change-Id: Iba1b0cafe5e82a46f652c3128c727d605658deed