Merge branch 'android-exynos-3.4' into android-exynos-manta-3.4