 - Fix potential issue with includes in Android wrapper
 - Fix potential issue with includes in Android wrapper

hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie,hbirchtree/coffeecutie