Merge "Revert "Add genrules for merged removed.txt files""