Revert "h: fix double suspend/resume issue"

This reverts commit d9b2377d94b5dd2139831ca38211281d47809f2f.

Change-Id: I5f8b2162f74cffe1678637ad21f2600ccaf0260a
Revert "hlte: shutdown capative key when fbblanks"

This reverts commit 0ee1db5d1e73e8cbfb39df080ad1b84586914783.

Change-Id: I29c89a52ed3d7a5711cd7eec1de74adc86a0baca
Merge branch 'cm-11.0' into martincz