Merge "Fix building static linux binaries"