Merge "Include structs lib in service-connectivity-pre-jarjar" into main