Merge "Performance improvement in DiskLruCache.readJournalLine()."