Merge "lshal: PipeRelay: use modern classes."