Merge "Remove Android.mk which is unused." into main