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

Change-Id: Ied0ed23ad8c425418f27197c87a768c1f91e74d0