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

* commit 'e7a46c48417ff67390d80d6df457742b30430857':
  Add lib symlink to x86_64 so that 32-bit static libs are available