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

This reverts commit 8c6dc4fb6dff221e1c3a394d00f6657c8daae48b.