Merge "Remove the unused TrackHeader structure."
am: fe60bae4b7

* commit 'fe60bae4b71f9b4d50912f06acac601762e55b73':
  Remove the unused TrackHeader structure.