Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/power-exynos