am b6cf9117: Merge "Support zone.tab in libcore, and remove the file format version."

* commit 'b6cf91174c142ff218b15124a5ff46dbfbe920fc':
  Support zone.tab in libcore, and remove the file format version.