Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36

Change-Id: Idecc45db93e86c591a173945bd16d14d2a3bac3e