Merge "lib/modules: Re-implement queue_rw.go without depending on upcqueue."