Revert "Merge remote-tracking branch 'AOSP/android-4.4.2_r1' into kitkat"

This reverts commit 5848ad636d5ec6dff5cce68122b167056c8fc389, reversing
changes made to 2adf97b6c8aa312674d7fff43ff54f9b108ec069.