(This is a merge of http://go/wvgerrit/13911/ from the Widevine CDM repository.) This wasn't causing problems anywhere yet, but the headers included by file_store.h were not the headers it actually needed. Change-Id: I89e6fd30efc8837ba44ce6cfd6d7a7b77db7197a