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

This reverts commit 2a5fa9790e16cdd4d728e8bb6774a9f92d963c27, reversing
changes made to 2caa21f1a1afa494fdd98a48a83c624b77f57f50.