Fix keymap build dependencies and variable name collisions

Change-Id: I06e67ddc97429ae9c3d04143934c3f8233fcd22f
4 files changed