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

Change-Id: I76c30f34e72d533e32c2f43380a0a43128c9442a