Merge "Remove Android.mk file" am: 1f1286e01d am: 60f8169217

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2106562

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