Replace gesture app with cmhw class for tap-to-wake

Change-Id: I7ed61bb735a090176b235c2a9c7c69d7a9bc11d9
Merge branch 'cm' into HEAD