Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"