Edit files to make them compatible with Android builder
Merge pull request #1 from alessandro40/android-fixes

Edit files to make them compatible with Android builder