Merge "Some CTS Makefile Cleaning"