Merge "Hide StkLib from the platform"