change S2W/DT2W to ported from (https://github.com/n3ocort3x/m7_aosp_GE_merge)

not working