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

This reverts commit 044d7251b4514dd33a451016e6549844977fa70d.