Revert "TEMP Revert "properties.h: avoid duplicating constant values""

This reverts commit a10d409ca64d1f63ccbe86ba4cda3333be09ce19.
Merge remote-tracking branch 'cm/kitkat' into kitkat