Revert "Merge tag 'android-4.4.3_r1' into kitkat2"

This reverts commit 80f60121725af57f64839c75798b498aedcbb81d.