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

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