Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code" am: 1d59671fd8
am: f70f3b7b7b

Change-Id: Iae611e7656e51207c720de4d6fd93b2c2603fb03