Merge "Delete corrupt cache entries from ~/.gerritcodereview/buck-cache"