Merge "Remove VNDK definition(s)" into main