From Jordi Torres, Android build fix