Merge "Move android_get_control_socket out of line"