Merge "Remove obsolete files on preloaded classes." am: 637477eb87 am: a54de89cf0

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

Change-Id: I7a2336951f7e65216fc218e2df8bde8e87983d87