Restart Merge Request

move android case further down so device rules can pick up more on
android devices
make android rules less sensitive to incorrect language field add cases
for Sony and Samsung