Fix because Android is still fragmented (bug 871586)

We still differentiate between "mobile" and "tablet", so we need to
specify that.

Also, added a test.