Better detection of Sony Xperia devices

Sony is using a really messy naming scheme across their products but hopefully this should cover recent devices.