mvebu: make patches apply against 3.18.18 again