am 18495ea3: am a8c74842: am 16a6b2a9: Merge "Make dicttool read the compressed combined format."

* commit '18495ea3390bee659e38cf0b12e0d79a44af2c1a':
  Make dicttool read the compressed combined format.