Revert "Fix other build errors"

This reverts commit 9dabe0367c819b7b05a00f4dbaeca8e38780b7c6.
Revert "Fix some build errors"

This reverts commit 9354124fef9d7f8efea8902ba8a6be6041422b91.
Revert "SystemUI:fix BatteryMeterView for ChameleonEngine"

This reverts commit ec2b931655790df57e3a9d5feccae0d84f205145.
Revert "SystemUI: Support BatteryMeterView for Chameleon"

This reverts commit a72664d17ee08b6baff60688d19226df283f59f8.

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