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

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

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