Common-loader patch by Jonathan Levine

- When loading a file, it will now attempt to load the non-specific
  version of that file as well (en-US loads both en-US.json and en.json)

Change-Id: Iafc7505272c60518062b817f1a149ebad649b028