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

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

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