Merge "defconfig: enable sync and sw_sync"