Merge "Update CleanSpec.mk for the common testcase directories." am: b99df8d27d
am: f4e04c8f87

Change-Id: I7c8c199abb677eb23de92bd8095d427b1e0b9e76