Merge "Remove empty Android.mk" into main