Merge "libcutils: Simplify android_get_control_socket()" am: 5f70ed6ee1
am: d540d5630c

Change-Id: Id890fa1abce1a19cf85da171f10d1b97891c4a38