Fixed android device detection

-Android devices are now properly picked up, and classified as tablet
or phone depending on their screen size.