Revert "Adopt Google's device specific conditional nomenclature"

This reverts commit b5729b7ece822fce79a0a1b449d1967abaf4ee93.