Add CleanSpec.mk steps to fix broken ones
am: 089939371c

Change-Id: I60ab192f9aed622db6aff654c6f4efbb3d8e7998