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

Change-Id: I9bee46a6cead0ba5df4c22b0d2d9d9b902153448