am 2b9d0f5e: am 803029bb: Merge "Remove Rhodi keylayout" into lmp-dev

* commit '2b9d0f5e4f5ce83a10eee9800d154d782699e06b':
  Remove Rhodi keylayout