Merge branch 'osx-sysroot-cleanup' into release