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

Change-Id: Ie99267431e980e008b3b27b1f93a58377d94e648