Merge "[SO] update the recursive orch branch in the SO build scripts"