Resolve conflict in naming of ahat module and file am: 196d4674dc am: 4075ae5736 am: e987819f75 am: 56c5925e24

Original change: https://android-review.googlesource.com/c/platform/art/+/2200104

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