update to ics_chocolate

reverted 2 commits 248e0c5 , c972042 that broke TouchScreen and Buttons, seems that commits not needed in JB
also 
0c05a48  fix for proper compile