Android build fix