Fix derp
Add back flip tiles
Add hardware tunables (gamma, color, vibration strength).

Change-Id: I44e3e4e6cb444498a7c56048618cd92a0e2b8e59

Conflicts:
	proguard.flags
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Conflicts:
	proguard.flags
Revert "Add hardware tunables (gamma, color, vibration strength)."

This reverts commit 5013fbbba6ecfb7a198d1068d5793fe5bde40fa0.

Conflicts:
	proguard.flags