am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"

* commit 'dca2b5d7c29ee06f3c82527dd7264fcc21cac9a6':
  Changed parsing of trkn and disk from 8 bits to 16 bits