Merge "Add VNDK version for namespace configuration files"