Reordered cyanogen kernel conf and added options from S4 kernel