Merge branch 'android-4.4'