merge android-4.4