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

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

Change-Id: I24152a58ea0ae22fe29b04fb9cbb3351b65b7aaf