Merge "Add genrules for merged removed.txt files"