Merge "Move old installed file cleanup logic below build/make/core/Makefile"...

Merge "Move old installed file cleanup logic below build/make/core/Makefile" am: 4cd2568a am: b8dad832

Original change: https://android-review.googlesource.com/c/platform/build/+/2544890



Change-Id: I61bc49e29f62e3b39dbb60f67bf6a882176b6274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>