Merge remote-tracking branch 'slim/kk4.4-caf' into ose

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/app/WallpaperManager.java
	core/java/android/widget/ProgressBar.java
	core/jni/android/graphics/Paint.cpp
	core/res/res/values/colors.xml
	core/res/res/values/config.xml
	media/java/android/media/AudioService.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/ConnectivityService.java
	services/java/com/android/server/pm/PackageManagerService.java