Merge tag android-4.4.2_r2 into HEAD