Defconfig: changes for new rom builds
chmod 0755 merge_config.sh