Revert: Fix typo in WatchedFileHashCache

Summary: This reverts commit Fix typo in WatchedFileHashCache.

Test Plan: revert-hammer

fbshipit-source-id: 2d27e6e

src/com/facebook/buck/util/cache/WatchedFileHashCache.java

@@ -58,15 +58,7 @@ public synchronized void onFileSystemChange(WatchmanPathEvent event) {
     // Path event, remove the path from the cache as it has been changed, added or deleted.
     Path path = event.getPath().normalize();
     LOG.verbose("Invalidating %s", path);
-    // This can't call invalidate() below because we need to call invalidateOldCache() as
-    // opposed to invalidateOld().
-    long start = System.nanoTime();
-    invalidateNew(path);
-    newCacheInvalidationAggregatedNanoTime += System.nanoTime() - start;
-    start = System.nanoTime();
-    invalidateOldCache(path);
-    oldCacheInvalidationAggregatedNanoTime += System.nanoTime() - start;
-    numberOfInvalidations++;
+    invalidate(path);
   }
 
   // TODO(rvitale): remove block below after the file hash cache experiment is over.
@@ -276,7 +268,7 @@ public void invalidate(Path relativePath) {
     invalidateNew(relativePath);
     newCacheInvalidationAggregatedNanoTime += System.nanoTime() - start;
     start = System.nanoTime();
-    invalidateOld(relativePath);
+    invalidateOldCache(relativePath);
     oldCacheInvalidationAggregatedNanoTime += System.nanoTime() - start;
     numberOfInvalidations++;
   }