- updated Android.mk generation
Merge pull request #40 from SmartCat/gaf_4_develop

updated Android.mk generation