Merge change 7701

* changes:
  Clean up MP3Extractor code and fixes a bug that miscalculated the position of the header by a few bytes whenever we read in more data.
tree: 03b3de6f2ae3c4f8ea690a27b9c10fdeba14a15a
  1. cmds/
  2. include/
  3. media/