Merge "Change other CTS sub-tests to not use fixed build location."