Revert "Merge remote-tracking branch 'upstream/kk' into kitkat"

This reverts commit 33f47307262b1b2be492fa1a16aa78bc4e9a20f9, reversing
changes made to 2f00c1cdd34bb45ecb554c4fa04d02b3e5d1b056.