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

This reverts commit f2afe12f29c690b9f585345043a46fc0f9efba15.