Merge "remount: Remove unused option -C/--clean_scratch_files"