Merge "framework-wifi: remove duplicate classes"