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

Change-Id: I63521c4888823137f024fb5395409791dc69ab7c