Build fix for Chameleon Engine

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: If8066ac392ea43d230a8550c9e731bd2a6c49439