d2-common: use proper hardware key bit field

This allows remapping of the proper keys in System > Hardware keys

Change-Id: I62ee00251b98ec38734e26e8a887f845857169b8
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD