Merge "Create host specific lib variant" into main