Reorganise Android.mk