Two fixups to SearchResult

- Make variables protected. Only class that uses these is LuceneResult
  and it's fine
- Don't bother constructing a new file object if we've already got
  one in memory (we likely do)

Change-Id: I7973aff1e96297a2fea70392b765c93a8c884d52
Merge "Two fixups to SearchResult"