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 am: e453ae2d

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

Change-Id: Ie33e6632618ca6a7af0efa95b36c3a2cc13a8bf3