Merge branch 'next/cleanup-use-static' into next/cleanup-exynos-clock