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

This reverts commit c3aaa9c2be80263c86fcecaf095d7b9f7b76c34f, reversing
changes made to 0f2cd788c837616b22a09de4c2620adad12b16cb.