Android.mk
Merge branch 'develop'