Merge "wifi: Jar jar all external dependencies to a singe namespace" into rvc-dev