Revert "Merge remote-tracking branch 'upstream/android-4.4' into android-4.4"

This reverts commit 41aff710e5891080753f1f52bb7a60a332a73361, reversing
changes made to 0829296c25efce6517834c67f784444fd32a7f31.