Make "clean" invoke "novo", and make "clobber" do what "clean" used to do.

Change-Id: Ica36499832e59dd3028406bda5c8309859f9e7f1