am b2ba5636: Merge "Revert "Don\'t rename host libraries if only one arch is build.""

* commit 'b2ba5636f187e7d2f3d2f0497bfaca68c5c7b06c':
  Revert "Don't rename host libraries if only one arch is build."