Android build fixes.