Merge "Delete .java files"