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

Change-Id: Ib8747791a02a5e291aabb3103dbf779830668bfd