android: Merge Sony DualShock 4 v1 and v2 to Wireless Controller.cfg#1276

davidhedlund wants to merge 2 commits intolibretro:masterlibretro/retroarch-joypad-autoconfig:masterfrom

davidhedlund:masterdavidhedlund/retroarch-joypad-autoconfig:masterCopy head branch name to clipboard