Merge "Don't disable vendor tracing when --only_userspace"