Fix android build, fix river generation (WIP)