Sync ville_defconfig with cm