Revert "Revert "add control-* keymap config""

This reverts commit 4efd96595b571326444915a28147ffa988bb4051.

The commit 4efd96 reverted a commit that adds an inter-dependency
which broke buildbot. This commit reverts the commit 4efd96 without
introducing the inter-dependency.

Change-Id: Ib4ce3c46d71375228bf5ff5f261103a1277f3344
Reviewed-on: http://gerrit.chromium.org/gerrit/1810
Tested-by: Che-Liang Chiou <clchiou@chromium.org>
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
6 files changed