Merge "Some cleanup for tests 960-965 build scripts."