Merge "Some cleanup for tests 960-965 build scripts." am: 02c330f6af
am: 60d852bdf4

* commit '60d852bdf48a4ca823c9b597efe923b421c68f2c':
  Some cleanup for tests 960-965 build scripts.