Merge branch 'samsung/cleanup-plat-s5p' into next/soc2