Updated device types to collapse android mobile/tablet (bug 969242)

Also changed wording from device types to platforms.