[2/2] OmniGears: allow disabling haptic feedback for virtual keys

Allows disabling haptic feedback for devices with
capacitive buttons (virtual keys)

Change-Id: I8a4ceac650e611f8a110b08c9e9f7f074e4b22c4
OmniGears: volume key music control

Requires https://gerrit.omnirom.org/#/c/3860/

Change-Id: I8d0b1007d64c16d1fd96d3f8086396afc57d25a2
Revert "OmniGears: volume key music control"

This reverts commit ba174fdf3b7f235e3b8f27b8eb8239ccb8063f31.
Merge branch 'head' into kitkat