Merge branches 'heads/soc-cleanup-for-v3.21' and 'heads/defconfig-for-v3.21' into devel