[OS-BUILD PATCHv3 7/19] spec: Fix separate tools build