[Bug 1335683] New: [Patch] Fix static libraries