Merge "Delete duplicate files" into tools_r21.1