Merge "Remove the unnecessary PRIVATE_CLEAN_FILES"