From Jordi Torres, fix for Android build