am ec1323db: am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into mnc-dr-dev

* commit 'ec1323dbd4558f9d4ff422c8547334fe13242ad0':
  Allow defining replacement key events in keymap