Critical fix needed for Android build.
Merge pull request #4901 from cb1kenobi/master

Critical fix needed for Android build.