Merge "Remove build workaround for wifi stubs" into rvc-dev