am 8abb5cc1: am a160e316: Merge "Fixed problem with keymap files copied to target"

Merge commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8'

* commit '8abb5cc10f295940e6706c72e2e0c93bf0de01e8':
  Fixed problem with keymap files copied to target