Merge "Merge "Added mapping files for DualShock3 and DualShock4" am: 85aadab7e4 am: d050a2edd6 am: 1f6af2e769"