Fix make clean and mrproper
Sync up with CM