Merge tag 'android-4.4.1_r1'

Android 4.4.1 Release 1

Conflicts:
	core/java/android/os/FileUtils.java
	core/jni/android_os_FileUtils.cpp
        core/res/res/values-mcc310-mnc260/config.xml
	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
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/display/WifiDisplayController.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java