Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos