[automerger skipped] Merge "Add files to CleanSpec.mk"
am: 53fe135595  -s ours

Change-Id: I1d2680a2f9c3264de4302839c08d3b2cf6f3a1f5