Yet another atempt to fix Android CI build...