Merge "Remove Android.mk."