Revert "Merge commit '8f446a7a069e0af0639385f67c78ee2279bca04c' into android-exynos-3.4"

This reverts commit 7002f22eac57c6c70e5bc281869f2d37d46a6bcc, reversing
changes made to 443084caa2ece8c57e7e91f247500a5c5e751a53.