Merge "Fix build issue for Exynos build target"