halo, wrong touch calculation, nap trigger fixed

Change-Id: Ib09163d71cddb2cbe8f375313e0c1e03b37fd504
Signed-off-by: Dan Trifan <jimsth@gmail.com>
halo, still wrong multitouchhandling

Change-Id: Id9c00c25add4a493309f170eb97acf0a06c378d0
Signed-off-by: Dan Trifan <jimsth@gmail.com>
Merge "halo, wrong touch calculation, nap trigger fixed" into jb43
Merge "halo, still wrong multitouchhandling" into jb43