Merge "Remove Android.mk file" am: 1f1286e01d am: 60f8169217 am: 65eb202f37 am: 088bfc97d1 am: 9da0ea4767

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

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