add include export for android
fix for android
Merge branch 'android' into develop