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

Merge "Remove obsolete files on preloaded classes." am: 637477eb am: a54de89c am: 02b0ec46 am: e833855a

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

Change-Id: I7ed4099a60a32b98ad388e0c2c7f256d8414a517