Merge "Revert "Cleanup dirty daisy build workspace directory""