m7spr: Correct manufacturer, htc to HTC

Change htc for m7spr manufacter to HTC to make the string look cleaner
in Android Device Manager and Google Play Store (commonly used by users),
as well as any app that reads ro.product.manufacturer from build.prop.
Also, HTC styles their name in print as being uppercase and generally have
it uppercase in their stock ROMs.

Change-Id: I7a7ea1d0b9be2e8c0054446e6d36dad8f6298e76
Merge branch 'cm-10.2' into martincz