Merge "Merge "Added mapping files for DualShock3 and DualShock4" am: 85aadab7 am: d050a2ed am: 1f6af2e7"