modify the git merge tool
modify the ndk config
add sync_rockchip.sh to sync rockchip software release