Revert "merge android-4.3_r2.2 into jb4.3"

This reverts commit 6d303d89a27030eb02c10848c257da18f2f89bf8.