Merge "Add CleanSpec.mk file" into master-cuttlefish-testing