Merge "libcutils: Simplify android_get_control_socket()"