Merge "Update nintendo joystick layout" into rvc-dev am: cada936a am: c6fef615 am: acbae15a am: 16179eb0 Change-Id: I488f4187c612480d266160fe55a9353280ba7d07