Merge "[WIFI] Remove dependency on vendor-specific library" am: 294340e1d4 am: ee9e5b843a am: 664584f74e
am: b45e3db44d  -s ours

Change-Id: Ib72bb0d680f9a20436c39f6579595fae1e61426b