reflect structual changes in Android.mk