Upgrade mkgmap from r2785 to r3168