Merge "Remove unnecessary Android.mk" into main