Revert "Merge remote-tracking branch 'remotes/aosp/kitkat-mr2-release' into kk44"

This reverts commit 52024870bcb2770fb2c7f14a1a7d30bf6f0c129b, reversing
changes made to 20045dbe7c288eaa12f5f00442959f5bb2e71a74.