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

Change-Id: I93513400c2a75af2c31aecca92856789e71f4f34