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

Change-Id: I9af0a65579ce93ff59357e8df9848f40a94e0211