am d13fa001: am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev

* commit 'd13fa0018b273f0db13154d520f7f0d11a2cb375':
  Special case game controller fallback keys for Japan