Remove extra product property overrides

This appears to clash with vendor/cm/common mk's for overrides; causes
a broken default alarm (and OnTheHunt is so bleh).

Change-Id: I5ec990d3c5ad56b573c45f1a3b20169c989851a0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0