Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: ee5248c7b5 am: 02af9b4b2f am: 28c5f354a0

Change-Id: Ia71483ed9ed38a64cfcf450c15c4b8ba165241a4