Merge "Update CleanSpec.mk for the common testcase directories."