Merge "Update the format of module variant dir name"