Merge "Add files to CleanSpec.mk" into pi-dev
am: 93d48fe0b6

Change-Id: I2a1954820be0c4fe94b6a2c0bb0fe8e3bc485f85