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

Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc2 am: de51075d am: 1691d6d0 am: 4c42b5ee

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

Change-Id: I28a8008b6228d95f906499acab64c20f80120459