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

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