Merge "[WIFI] Remove dependency on vendor-specific library" am: 294340e1d4
am: ee9e5b843a

Change-Id: If233628bbc5e269353c1fd5c130d4391cb66fa61