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

This reverts commit dc76488a0fa4de888ab7a6b86007f87a53251212.