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

Change-Id: I163dc6181aa4ac075950cd579486e778cf346306