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

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

Change-Id: I667eb3343e8e60ce2c1e030cadb0058e57ded796