Merge "Use android_get_control_socket from the rustutils crate" into main