restart.c: reset to kk_3.5 and add HTC changes on top.