Revert "Merge tag 'android-4.4.3_r1.1' into HEAD"

This reverts commit 6ca5db01b54a7c98c80b31b34906b215d7a7d571, reversing
changes made to be4509382094c5e0263733aa66298e2bd019bf42.