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

Also changed wording from device types to platforms.