Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: I8e57f13db22b46bf1394dd43b905bb0bf8510d18