[connman] fix crash and remove files from bad merge