Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
am: 74f7ccd680  -s ours

Change-Id: I1c1900868023a031c25d60095454c224fe60ac72