Revert "Merge tag 'android-4.4.2_r2' into HEAD"

This reverts commit b2e6f3065a06804786d48ac444445b67f8ab4c3e.