Merge "Don't rename host libraries if only one arch is build."