Merge "Use proper platform version checks (apigen)" into rvc-dev