merge fe2ecc348bb82ed644512a9bd62e3e0b05dad173 from
CyanogenMod/android_kernel_htc_m7
Includes First raw of porting old to new ion api calls