cmhw: make TapToWake opt-in

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