Merge "Add wifi util lib to classpath for wifi stubs" into rvc-dev