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

This reverts commit 9940d995ca08c050cd2e7893130a47dd7fe37c6f.