Revert "Align ro.product with stock"

This reverts commit d620c4d.

Change-Id: Iaf83b40e0da642a064e575a25790eb059c4f3ca4

cm.mk

@@ -4,13 +4,11 @@ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 
 $(call inherit-product, device/htc/m7spr/full_m7spr.mk)
 
-PRODUCT_NAME := cm_m7spr
-PRODUCT_DEVICE := m7spr
-
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRODUCT_MODEL=HTCONE \
     PRODUCT_NAME=sprint_wwe \
-    PRODUCT_DEVICE=m7wls \
     BUILD_ID=KOT49H \
-    PRIVATE_BUILD_DESC="4.06.651.4 CL303687 release-keys"
     BUILD_FINGERPRINT="htc/sprint_wwe/m7wls:4.4.2/KOT49H/303687.4:user/release-keys" \
+    PRIVATE_BUILD_DESC="4.06.651.4 CL303687 release-keys"
+
+PRODUCT_NAME := cm_m7spr
+PRODUCT_DEVICE := m7spr