Android build fix
Merge pull request #1032 from raven02/patch-6

Android build fix