merge tag android-4.4_r1 into head