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

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