Merge tag 'android-4.4.1_r1' into v4.4

Android 4.4.1 Release 1

Conflicts:
	core/java/android/os/BatteryStats.java
	core/java/com/android/internal/os/BatteryStatsImpl.java
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

Change-Id: I634a76cfca86e022479d1eebe1ee214e3fbb4d0b