Merge "buildroot: accomodate several versions for libWV*"