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

This reverts commit 331c58f757fa2f65cf168b4204d6b8862e19a8dd, reversing
changes made to 0a0acd5fc48edacc19b685edf7c4c97359ca832d.