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

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