changes to regexes

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
allow for case where build/ doesn't follow device name