Merge "Add license_kinds to VNDK snapshot modules"