Squash cmhw controls for kcal and vibrator

Change-Id: Ib9ce8047fff6983ecb94e8d8efd3ee5f0727aae0