Merge "Clean up dist files."