Merge "Make CtsPriv and CtsPrivShim build standalone." into rvc-dev