Merge "Limit VNDK entries to latest frozen version." into rvc-dev