Merge remote-tracking branch 'common/android-3.4' into android-exynos-3.4