Buildfix (Android)
Merge pull request #2163 from raven02/patch-5

Buildfix (Android)