am 91f2dbb7: (-s ours) am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps."

* commit '91f2dbb7825af8fbef1ce5db1f42d3171d7487ce':
  Move keymaps from sdk/emulator/keymaps.