Merge "Add files to CleanSpec.mk" into pi-dev