Revert "Move status bar native battery percentage into status bar battery style"

This reverts commit 041e356a28d1ab35aba4b5f449c3effcaf2adb7f.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
Revert "Circle battery"

This reverts commit dc440745dbadbf24de188df88cceb00dabb083ee.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Revert "Status bar native battery percentage"

This reverts commit d266826c6260cb74a4ca2e6d3d7ed8242be42427.

Conflicts:
	core/java/android/provider/Settings.java
Statusbar battery icons

Conflicts:
	packages/SystemUI/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
WifiController: fix high perf lock sometimes not respected

When the device screen is turned off, the state is DeviceActive for
15 minutes. In this time, high perf lock is not respected and
Wi-Fi power-saving mode will be turned on because screen is off.

Fix by adding a new DeviceActiveHighPerfState.

Change-Id: I71074beec4d41286dea0861107d7931da205aca2
JIRA: CYAN-2860
Battery:fix build errors