Revert "cmhw: Use hardware's default value for color enhancement"

This reverts commit 8cfeb1c4a1f2867f5a921f7194110f774f0f856e.
Revert "Settings: Add default value for display color control (2/2)"

This reverts commit a1a0d9df55d9c12677a7c90b25c1f605d91690be.
Fix upgrade to latest proguard

Change-Id: I3fc77adc895e98673005e89bb99a38744f01bb97

Conflicts:
	proguard.flags