Revert "Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/frameworks/base into jb-devel-mr2-release"

This reverts commit 9431d59aef0cc03446061caa5a2cd722bfe11dcb, reversing
changes made to 35d49f3b94031d09b0c13e8ad5d31f71715bd0bb.