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

This reverts commit df4822ef8ac1ed2b64b8376a29307b835b97530e, reversing
changes made to e3422459524e20107b82be5cfdd6e55765ceac5a.