Merge "framework-wifi: remove duplicate classes" into rvc-dev