Merge "Update nintendo joystick layout" into rvc-dev am: cada936a36 am: c6fef615fe am: 0d42e10d54 am: ec179e77d5
Change-Id: I643611e5ff8f6f925a56befc6531170a538bbfe6
This commit is contained in: