Merge "Remove Android.mk file"