Merge "Add static library build"