Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: c6fef615fe am: acbae15aad am: 16179eb08b

Change-Id: I488f4187c612480d266160fe55a9353280ba7d07